Skip to content

Commit

Permalink
sync 2024/4/21
Browse files Browse the repository at this point in the history 
fixup! UI: Settings blockRenderLevel
way-zer(himc.wicp@gmail.com) in 2024-04-20

C(RenderExt) blockRenderLevel
way-zer(himc.wicp@gmail.com) in 2024-04-20

fixup! ARC merged 无意义设置
way-zer(himc.wicp@gmail.com) in 2024-04-20

fixup! ARC merged remove getThemeColor()
way-zer(himc.wicp@gmail.com) in 2024-04-20

fixup! ARC bundle and settings 移除一些无效设置
way-zer(himc.wicp@gmail.com) in 2024-04-20

fixup! C: AutoUpdate
way-zer(himc.wicp@gmail.com) in 2024-04-20

fixup! API: ui.Format
way-zer(himc.wicp@gmail.com) in 2024-04-20

API&C: DebugUtil
way-zer(himc.wicp@gmail.com) in 2024-04-20

CS: 减少部分lambda内存分配
way-zer(himc.wicp@gmail.com) in 2024-04-20

C: no MapPreviewLoader.setupLoaders
way-zer(himc.wicp@gmail.com) in 2024-04-19

fixup! C: StatExt 单位能力显示 优化
way-zer(himc.wicp@gmail.com) in 2024-04-18

fixup! C(RenderExt) researchViewer(科技树透视)
way-zer(himc.wicp@gmail.com) in 2024-04-18

fixup! CF: MarkerType 标记功能
way-zer(himc.wicp@gmail.com) in 2024-04-18

fixup! ARC merged 重置标记系统
way-zer(himc.wicp@gmail.com) in 2024-04-16

CF: MarkerType 标记功能
way-zer(himc.wicp@gmail.com) in 2024-04-16

API: Hooks.pollKeys
way-zer(himc.wicp@gmail.com) in 2024-04-16

fixup! C: StatExt
way-zer(himc.wicp@gmail.com) in 2024-04-16

CS: 优化Building.updatePowerGraph性能
way-zer(himc.wicp@gmail.com) in 2024-04-14

fixup! ARC merged 微微简化
way-zer(himc.wicp@gmail.com) in 2024-04-13

fixup! ARC merged reformat
way-zer(himc.wicp@gmail.com) in 2024-04-13

fixup! fixup! C: claj功能 PausedDialog重排;修复一个潜在的claj代码输入bug
way-zer(himc.wicp@gmail.com) in 2024-04-13

fixup! C: 首页浮动标语(重置)
way-zer(himc.wicp@gmail.com) in 2024-04-13

fixup! ARC merged PausedDialog重排
MinRi2(2275045670@qq.com) in 2024-04-11

fixup! C: claj功能 PausedDialog重排;修复一个潜在的claj代码输入bug
MinRi2(2275045670@qq.com) in 2024-04-11

fixup! ARC setBars 热量百分比显示
way-zer(himc.wicp@gmail.com) in 2024-04-13

fixup! C: TimeControl
way-zer(himc.wicp@gmail.com) in 2024-04-10

fixup! C: AdvanceToolTable 移动工具箱位置
way-zer(himc.wicp@gmail.com) in 2024-04-10

BUILD ci
way-zer(himc.wicp@gmail.com) in 2024-04-10

fixup! ARC merged 性能优化
way-zer(himc.wicp@gmail.com) in 2024-04-09

fixup! ARC merged clear
way-zer(himc.wicp@gmail.com) in 2024-04-09

C(RenderExt) unitHide
way-zer(himc.wicp@gmail.com) in 2024-04-04

ARC merged
way-zer(himc.wicp@gmail.com) in 2024-01-24

C: 小地图大小可调
way-zer(himc.wicp@gmail.com) in 2024-04-03

UI: Settings
way-zer(himc.wicp@gmail.com) in 2024-03-28

ARC setBars
way-zer(himc.wicp@gmail.com) in 2024-03-24

API: Hooks.beforeInit
way-zer(himc.wicp@gmail.com) in 2024-04-03

C: fix console messages order
way-zer(himc.wicp@gmail.com) in 2024-04-04

C: 禁用聊天栏焦点转移
way-zer(himc.wicp@gmail.com) in 2024-03-28

C: AutoUpdate
way-zer(himc.wicp@gmail.com) in 2024-03-26

API: VarsX.isLoader
way-zer(himc.wicp@gmail.com) in 2024-03-26

C: misc patch
way-zer(himc.wicp@gmail.com) in 2024-02-18

C: 首页浮动标语(重置)
way-zer(himc.wicp@gmail.com) in 2024-03-23

ARC bundle and settings
way-zer(himc.wicp@gmail.com) in 2024-02-17

BUILD archash
way-zer(himc.wicp@gmail.com) in 2024-01-20

FC: ReplayController
way-zer(himc.wicp@gmail.com) in 2024-03-20

BUILD workflows
way-zer(himc.wicp@gmail.com) in 2024-03-03

BUILD buildPlugins
way-zer(himc.wicp@gmail.com) in 2024-04-09

FC: Loader Mod实现
way-zer(himc.wicp@gmail.com) in 2024-01-28

C: AdvanceToolTable
way-zer(himc.wicp@gmail.com) in 2024-03-02

API: ui.Format
way-zer(himc.wicp@gmail.com) in 2024-04-06

BUILD Kotlin 1.9.20
way-zer(himc.wicp@gmail.com) in 2024-03-02

C: TimeControl
way-zer(himc.wicp@gmail.com) in 2024-02-29

C: RenderExt.showPlacementEffect
way-zer(himc.wicp@gmail.com) in 2024-02-29

C: add a paste button in claj dialog
Cong0707(49234756+cong0707@users.noreply.github.com) in 2024-02-24

C: claj功能
way-zer(himc.wicp@gmail.com) in 2024-02-23

API: InternalMods
way-zer(himc.wicp@gmail.com) in 2024-02-23

API: Hooks.onHandleSendMessage
way-zer(himc.wicp@gmail.com) in 2024-02-23

C: StatExt
way-zer(himc.wicp@gmail.com) in 2024-02-18

C: staticShield
way-zer(himc.wicp@gmail.com) in 2024-02-17

C: StatusEffects翻译及"无敌"图标
way-zer(himc.wicp@gmail.com) in 2024-01-24

C(RenderExt) overdriveZone
way-zer(himc.wicp@gmail.com) in 2024-02-17

C(RenderExt) hiddenItemTransparency(桥梁交叉器透视)
way-zer(himc.wicp@gmail.com) in 2024-02-18

C(RenderExt) researchViewer(科技树透视)
way-zer(himc.wicp@gmail.com) in 2024-02-18

C(RenderExt) arcChoiceUiIcon(显示选中物品图标)
way-zer(himc.wicp@gmail.com) in 2024-02-17

C(RenderExt) bulletShow showMineBeam displayAllMessage arcTurretPlaceCheck
way-zer(himc.wicp@gmail.com) in 2024-02-18

API: RenderExt
way-zer(himc.wicp@gmail.com) in 2024-03-26

API: Hooks.onHttp
way-zer(himc.wicp@gmail.com) in 2024-04-09

C: 动态游戏标题
way-zer(himc.wicp@gmail.com) in 2024-01-24

API: add LogicAssembledEvent
way-zer(himc.wicp@gmail.com) in 2023-08-03

SO: Fix #6
way-zer(himc.wicp@gmail.com) in 2022-12-26

SO: improve ControlPathfinder.java (limit memory use)
way-zer(himc.wicp@gmail.com) in 2023-06-23

S: add `Config.locale` for localizedName
way-zer(himc.wicp@gmail.com) in 2023-06-23

S: Add icons.properties,bundles,block_colors.png to server build
way-zer(himc.wicp@gmail.com) in 2023-06-23

API: add SendPacketEvent
way-zer(himc.wicp@gmail.com) in 2023-06-23

API: Add `LogicBlock.running`
way-zer(himc.wicp@gmail.com) in 2023-04-09

S: update TypeIO.writeRequest
way-zer(himc.wicp@gmail.com) in 2022-02-02

CS: Bundle Extend
way-zer(himc.wicp@gmail.com) in 2024-04-09

CS: Version
way-zer(himc.wicp@gmail.com) in 2024-04-09

API: @MindustryXApi
way-zer(himc.wicp@gmail.com) in 2023-09-17

BUILD build.gradle.kts and clear
way-zer(himc.wicp@gmail.com) in 2023-06-23

SO: Early release #Anuken:9065
way-zer(himc.wicp@gmail.com) in 2023-09-17

BUILD: remove ScriptMainGenerator
way-zer(himc.wicp@gmail.com) in 2024-03-28

fixup! Commands are now content 导出地图与146不兼容问题
way-zer(himc.wicp@gmail.com) in 2024-04-04

fixup! Bindings per command/stance
way-zer(himc.wicp@gmail.com) in 2024-04-06

fixup! Optimize `wait`/`message` (#9086) 临时兼容146
way-zer(himc.wicp@gmail.com) in 2024-03-31

Fixed #9166
Anuken(arnukren@gmail.com) in 2023-10-15

Fixed #9156
Anuken(arnukren@gmail.com) in 2023-10-13

Slight puddle performance increase
Anuken(arnukren@gmail.com) in 2023-10-08

Optimize `wait`/`message` (#9086)
WayZer(himc.wicp@gmail.com) in 2023-10-07

Add privileged desynced client global variables (#9138)
ApsZoldat(128713348+ApsZoldat@users.noreply.github.com) in 2023-10-05

RailBulletType collision fixes
Anuken(arnukren@gmail.com) in 2023-10-03

Fixed #9121
Anuken(arnukren@gmail.com) in 2023-09-30

PICK @client
Anuken(arnukren@gmail.com) in 2023-09-28

Fixed #9094
Anuken(arnukren@gmail.com) in 2023-09-26

Better turns for units pathfinding near blocks
Anuken(arnukren@gmail.com) in 2023-09-24

Commands are now content
Anuken(arnukren@gmail.com) in 2023-09-24

Fixed tests
Anuken(arnukren@gmail.com) in 2023-09-23

Bindings per command/stance
Anuken(arnukren@gmail.com) in 2023-09-24

PICK 2286b54011d1cf1bc80f104154e778d2b1581e13
way-zer(himc.wicp@gmail.com) in 2024-03-28

Command hotkeys
Anuken(arnukren@gmail.com) in 2023-09-23

Offset tooltips on mobile
Anuken(arnukren@gmail.com) in 2023-09-22

PICK Fixed setProp x/y not teleporting on strict servers
way-zer(himc.wicp@gmail.com) in 2024-03-28

Unnecessary Drawer Icon Adding (#9078)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-09-20

Fixed #9077
Anuken(arnukren@gmail.com) in 2023-09-20

RTS Control groups
Anuken(arnukren@gmail.com) in 2023-09-20

Fixed commanded units attacking invalid targets
Anuken(arnukren@gmail.com) in 2023-09-18

PICK 844894f5849fb3872f965a4e16498db987f1dc7d
way-zer(himc.wicp@gmail.com) in 2024-03-28

Fixed #9055
Anuken(arnukren@gmail.com) in 2023-09-14

Implements Anuken/Mindustry-Suggestions/issues/4665
Anuken(arnukren@gmail.com) in 2023-09-14

Clamp mobile view
Anuken(arnukren@gmail.com) in 2023-09-13

Ban/Unban Blocks & Units with World Processors (#9052)
Mythril382(77225817+Mythril382@users.noreply.github.com) in 2023-09-13

Removed pointless statement
Anuken(arnukren@gmail.com) in 2023-09-10

More ServerControl improvements (#9038)
Darkness(79508138+Darkness6030@users.noreply.github.com) in 2023-09-09

Fixed #9031
Anuken(arnukren@gmail.com) in 2023-09-07

add `@server` to logic (#9018)
WayZer(himc.wicp@gmail.com) in 2023-09-06

Support for JSON planets without a parent
Anuken(arnukren@gmail.com) in 2023-09-05

PICK allow set `@shield`
way-zer(himc.wicp@gmail.com) in 2024-03-28

Crash fix
Anuken(arnukren@gmail.com) in 2023-09-04

PICK: cat and ranai
Anuken(arnukren@gmail.com) in 2023-09-04

fixed #9017
Anuken(arnukren@gmail.com) in 2023-09-04

Fixed #9011
Anuken(arnukren@gmail.com) in 2023-09-04

Fixed monos not mining
Anuken(arnukren@gmail.com) in 2023-09-03

Fixed mod loading
Anuken(arnukren@gmail.com) in 2023-09-03

Fixed empty admin menu
Anuken(arnukren@gmail.com) in 2023-09-03

I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN V
Anuken(arnukren@gmail.com) in 2023-09-03

Build fix?
Anuken(arnukren@gmail.com) in 2023-09-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-09-03

Wave effect has color now
Anuken(arnukren@gmail.com) in 2023-09-03

fixes serp-specific fog issue (#9009)
Zerenta(80897573+Zerenta@users.noreply.github.com) in 2023-09-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-09-03

Updated Gradle + other deps
Anuken(arnukren@gmail.com) in 2023-09-03

Update servers_v7.json (#9006)
SSansssssssssssss(99086651+SSansssssssssssss@users.noreply.github.com) in 2023-09-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-09-03

Removed pointless test
Anuken(arnukren@gmail.com) in 2023-09-03

Update servers_v7.json (#9002)
Hahaa13(108379326+Hahaa13@users.noreply.github.com) in 2023-09-02

Automatic bundle update
Github Actions(runner@fv-az1288-16.o0wzvy5n03eezmoxic4fjdrj2g.jx.internal.cloudapp.net) in 2023-09-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-09-02

Fixed #9001
Anuken(arnukren@gmail.com) in 2023-09-02

Update servers_v7.json (#8996)
HamzaGSopp(104453337+HamzaGSopp@users.noreply.github.com) in 2023-09-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-09-02

Added setting to disable lighting
Anuken(arnukren@gmail.com) in 2023-09-02

Automatic bundle update
Github Actions(runner@fv-az583-536.gfcyaji220iezjk42vdvpdjtnh.phxx.internal.cloudapp.net) in 2023-09-02

most ability displays (#8981)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-09-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-09-01

Fixed #8993
Anuken(arnukren@gmail.com) in 2023-09-01

Update TraceDialog.java (#8992)
Darkness(79508138+Darkness6030@users.noreply.github.com) in 2023-09-01

Automatic bundle update
Github Actions(runner@fv-az206-922.oyyoanllshxeloefraqm4plxqh.jx.internal.cloudapp.net) in 2023-08-30

Add language to trace info (#8990)
Darkness(79508138+Darkness6030@users.noreply.github.com) in 2023-08-30

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-29

Possible corner death fix
Anuken(arnukren@gmail.com) in 2023-08-29

let DrawRegion drawer can draw regions rotate with building rotation (#8987)
zeutd(107938101+zeutd@users.noreply.github.com) in 2023-08-29

removal of alex V6 servers (#8983)
alex(67626131+alexpvpmindustry@users.noreply.github.com) in 2023-08-28

Automatic bundle update
Github Actions(runner@fv-az1114-440.v3gn4mkxnddubagvm3aoiftxed.cx.internal.cloudapp.net) in 2023-08-27

Fixed #8978
Anuken(arnukren@gmail.com) in 2023-08-27

Don't allow loaders to accept items/liquids from unloaders
Anuken(arnukren@gmail.com) in 2023-08-26

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-25

Reverted building explosion nerf completely
Anuken(arnukren@gmail.com) in 2023-08-25

Update servers_v7.json (#8974)
NazrinNya(137837419+NazrinNya@users.noreply.github.com) in 2023-08-26

Different block explosion damage formula
Anuken(arnukren@gmail.com) in 2023-08-24

Capped explosive damage of blocks
Anuken(arnukren@gmail.com) in 2023-08-23

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-22

Fixed #8967
Anuken(arnukren@gmail.com) in 2023-08-22

tree shadows (I'm sorry) (#8966)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-08-22

Update TreeBlock.java (#8965)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-08-21

add alex servers (#8962)
alex(67626131+alexpvpmindustry@users.noreply.github.com) in 2023-08-20

add a new server (#8960)
xem8k5(69492624+xem8k5@users.noreply.github.com) in 2023-08-20

Update Vietnamese translation (#8959)
SITUVNgcd(44901211+SITUVNgcd@users.noreply.github.com) in 2023-08-20

Update servers_v7.json (#8958)
lemon3357(126368248+lemon3357@users.noreply.github.com) in 2023-08-20

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-20

Fixed #8957
Anuken(arnukren@gmail.com) in 2023-08-20

Update servers_v7.json (#8955)
abcxyzDustry(138785336+abcxyzDustry@users.noreply.github.com) in 2023-08-20

Update servers_v7.json (#8950)
Valeriy(vnazarov@smokeofanarchy.ru) in 2023-08-19

#8897
Anuken(arnukren@gmail.com) in 2023-08-18

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-17

Ignore ratelimit for local
Anuken(arnukren@gmail.com) in 2023-08-17

Don't stop mining when planning (#8945)
南门阳德(66559840+nanmenyangde@users.noreply.github.com) in 2023-08-17

Cleanup
Anuken(arnukren@gmail.com) in 2023-08-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-15

Fixed #8939
Anuken(arnukren@gmail.com) in 2023-08-15

Update servers_v7.json (#8938)
a-big-fish-fish(111189982+a-big-fish-fish@users.noreply.github.com) in 2023-08-15

ServerControl improvements (#8928)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-08-15

Update servers_v7.json (#8936)
tech3mi(137229648+tech3mi@users.noreply.github.com) in 2023-08-14

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-14

Fixed #8935
Anuken(arnukren@gmail.com) in 2023-08-14

chore: Update chaotic neutral servers (#8934)
Phinner(62483793+phinner@users.noreply.github.com) in 2023-08-14

Precept revert and buff (#8930)
南门阳德(66559840+nanmenyangde@users.noreply.github.com) in 2023-08-14

Automatic bundle update
Github Actions(runner@fv-az1131-509.0xqdga4yyfmu3itawgde4i0n1g.dx.internal.cloudapp.net) in 2023-08-13

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-13

Added logic autoPathfind command
Anuken(arnukren@gmail.com) in 2023-08-13

Fixed: Units lose LogicAI after reading. (#8920)
MinRi2(85016284+MinRi2@users.noreply.github.com) in 2023-08-13

Fixed #8921
Anuken(arnukren@gmail.com) in 2023-08-12

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-12

Fixed #8924
Anuken(arnukren@gmail.com) in 2023-08-12

Fix point defense weapons ignore damage multiplier (#8922)
南门阳德(66559840+nanmenyangde@users.noreply.github.com) in 2023-08-12

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-12

Fixed #8923
Anuken(arnukren@gmail.com) in 2023-08-12

Scathe buff (#8919)
Zerenta(80897573+Zerenta@users.noreply.github.com) in 2023-08-11

Automatic bundle update
Github Actions(runner@fv-az442-315.2zqlei4p5yee3ip1pi5zld35qb.gx.internal.cloudapp.net) in 2023-08-11

Closes Anuken/Mindustry-Suggestions/issues/4608
Anuken(arnukren@gmail.com) in 2023-08-11

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-11

Closes Anuken/Mindustry-Suggestions/issues/4607
Anuken(arnukren@gmail.com) in 2023-08-11

add new ips and change old one (#8918)
IqKero(140623891+IqKero@users.noreply.github.com) in 2023-08-11

Fixed that the description of mech and ship was reversed (#8914)
Satoshi Sasaki(ailia.so.313@gmail.com) in 2023-08-11

Update servers_v7.json (#8913)
a-big-fish-fish(111189982+a-big-fish-fish@users.noreply.github.com) in 2023-08-10

Update servers_v7.json (#8912)
a-big-fish-fish(111189982+a-big-fish-fish@users.noreply.github.com) in 2023-08-10

Update servers_v7.json (#8911)
a-big-fish-fish(111189982+a-big-fish-fish@users.noreply.github.com) in 2023-08-10

Update servers_v7.json (#8908)
NazrinNya(137837419+NazrinNya@users.noreply.github.com) in 2023-08-10

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-09

Pathfinding bugfixes / Logic dialog hiding "unfixed"
Anuken(arnukren@gmail.com) in 2023-08-09

Aegires Nerf (#8899)
Zerenta(80897573+Zerenta@users.noreply.github.com) in 2023-08-09

Update servers_v7.json (#8905)
Hahaa13(108379326+Hahaa13@users.noreply.github.com) in 2023-08-08

Fixed #8904
Anuken(arnukren@gmail.com) in 2023-08-08

Fixed #8903
Anuken(arnukren@gmail.com) in 2023-08-07

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-05

Do not allow various negative rule values
Anuken(arnukren@gmail.com) in 2023-08-05

Update UnitTypes.java (#8895)
Zerenta(80897573+Zerenta@users.noreply.github.com) in 2023-08-05

Ignore wave version
Anuken(arnukren@gmail.com) in 2023-08-04

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-04

Fixed #8893
Anuken(arnukren@gmail.com) in 2023-08-04

ConsumeLiquidsDynamic (#8892)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-08-04

Fixed #8890
Anuken(arnukren@gmail.com) in 2023-08-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-02

WIP logic sync instruction
Anuken(arnukren@gmail.com) in 2023-08-02

Automatic bundle update
Github Actions(runner@fv-az364-282.1pkyza3ch1rutb35pi5oc1atsf.bx.internal.cloudapp.net) in 2023-08-03

WIP logic particle effect instruction
Anuken(arnukren@gmail.com) in 2023-08-02

Fixed #8887
Anuken(arnukren@gmail.com) in 2023-08-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-02

Fixed #8884
Anuken(arnukren@gmail.com) in 2023-08-02

SunMesh support for JSON planets (#8882)
Slotterleet(62336673+Slotterleet@users.noreply.github.com) in 2023-08-01

Render the selected planets solar system (#8875)
Idontuse(102253332+Idonotus@users.noreply.github.com) in 2023-08-01

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-08-01

Fixed #8871
Anuken(arnukren@gmail.com) in 2023-08-01

Update servers_v7.json (#8879)
karlo292(64750254+karlo292@users.noreply.github.com) in 2023-07-31

Update servers_v7.json (#8847)
tech3mi(137229648+tech3mi@users.noreply.github.com) in 2023-07-31

-127 ~ 128 to 0 ~ 255 entityTypeID (#8874)
Siede(63005632+siede2010@users.noreply.github.com) in 2023-07-31

Update servers_v7.json (#8873)
XaskyZ(50363144+XaskyZ@users.noreply.github.com) in 2023-07-31

Update servers_v7.json (#8872)
tech3mi(137229648+tech3mi@users.noreply.github.com) in 2023-07-31

Update servers_v7.json (#8869)
Hahaa13(108379326+Hahaa13@users.noreply.github.com) in 2023-07-31

Update servers_v7.json (#8866)
abcxyzDustry(138785336+abcxyzDustry@users.noreply.github.com) in 2023-07-31

Update StatusEffects.java (#8867)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-07-30

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-29

Fixed #8864
Anuken(arnukren@gmail.com) in 2023-07-29

Weird creation things (#8860)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-07-29

Update servers_v7.json (#8862)
XaskyZ(50363144+XaskyZ@users.noreply.github.com) in 2023-07-29

More empty floor bugfixes
Anuken(arnukren@gmail.com) in 2023-07-29

Added sensor for shields
Anuken(arnukren@gmail.com) in 2023-07-29

Fixed incorrect consumption rate in booster stats
Anuken(arnukren@gmail.com) in 2023-07-29

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-29

Fixed #8861
Anuken(arnukren@gmail.com) in 2023-07-29

Bullet despawn unit shenanigans (#8859)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-07-28

ToxoFlame attack server (#8858)
OSP(76648940+osp54@users.noreply.github.com) in 2023-07-28

Fixed #8856
Anuken(arnukren@gmail.com) in 2023-07-28

Fixed #8854
Anuken(arnukren@gmail.com) in 2023-07-27

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-27

Fixed #8849
Anuken(arnukren@gmail.com) in 2023-07-27

Update servers_v7.json (#8846)
tech3mi(137229648+tech3mi@users.noreply.github.com) in 2023-07-26

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-26

Misc bugfixes
Anuken(arnukren@gmail.com) in 2023-07-26

Rename my server and change ips (#8845)
Tomoko(65737359+Taras4k@users.noreply.github.com) in 2023-07-26

Expose NetServer currentlyKicking for plugin access (#8817)
BalaM314(71201189+BalaM314@users.noreply.github.com) in 2023-07-26

Allow fluid type configuration for ConsumeCoolant (#8841)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-07-25

Legacy blocks must not be logic constants
Anuken(arnukren@gmail.com) in 2023-07-25

Fixed #8840
Anuken(arnukren@gmail.com) in 2023-07-25

???
Anuken(arnukren@gmail.com) in 2023-07-25

Fixed #8837
Anuken(arnukren@gmail.com) in 2023-07-25

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-25

Fixed #8838
Anuken(arnukren@gmail.com) in 2023-07-25

Update servers_v7.json (#8836)
StalkerBaran(120944331+StalkerBaran@users.noreply.github.com) in 2023-07-25

Update servers_v7.json (#8828)
KhanhLamVirual(136421486+KhanhLamVirual@users.noreply.github.com) in 2023-07-24

German Translation (#8761)
Lime712(122940036+Lime712@users.noreply.github.com) in 2023-07-24

Update bundle_ca.properties (#8823)
Joan Josep(juanjo.ng.83@gmail.com) in 2023-07-23

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-23

Better implementation of #8810
Anuken(arnukren@gmail.com) in 2023-07-23

the camper (#8806)
Mythril382(77225817+Mythril382@users.noreply.github.com) in 2023-07-24

added new phoenix server (#8801)
nowords123(91344457+nowords123@users.noreply.github.com) in 2023-07-23

Destroy bullet team (#8792)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-07-23

toxoflame server (#8790)
Lanark53(138503808+Lanark53@users.noreply.github.com) in 2023-07-23

Update EntityGroup.java (#8802)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-07-23

Update servers_v7.json (#8825)
NazrinNya(137837419+NazrinNya@users.noreply.github.com) in 2023-07-23

Fixed #8830
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8827
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8819
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8813
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8807
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8795
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8794
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8789
Anuken(arnukren@gmail.com) in 2023-07-23

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-07-23

Fixed #8787
Anuken(arnukren@gmail.com) in 2023-07-23

Merge pull request #8805 from SSTentacleSS/patch-17
Epowerj(epowerj@gmail.com) in 2023-07-22

Update servers_v7.json
Tentyanuk(91948148+SSTentacleSS@users.noreply.github.com) in 2023-07-22

Merge pull request #8800 from TheRadioactiveBanana/patch-6
Epowerj(epowerj@gmail.com) in 2023-07-20

Merge pull request #8824 from thedimas3007/patch-8
Epowerj(epowerj@gmail.com) in 2023-07-18

Update servers_v7.json
thedimas(51395517+thedimas3007@users.noreply.github.com) in 2023-07-18

Update servers_v7.json
Tentyanuk(91948148+SSTentacleSS@users.noreply.github.com) in 2023-07-08

Forgot an ip
TheRadioactiveBanana(89061718+TheRadioactiveBanana@users.noreply.github.com) in 2023-07-07

Removal of dead ips and slight ip change
TheRadioactiveBanana(89061718+TheRadioactiveBanana@users.noreply.github.com) in 2023-07-07

Merge pull request #8796 from Def-Try/patch-1
Epowerj(epowerj@gmail.com) in 2023-07-05

Update servers_v7.json
CommandLine(71168720+Def-Try@users.noreply.github.com) in 2023-07-05

Disabled team switch outside of sandbox/PvP
Anuken(arnukren@gmail.com) in 2023-07-02

Four Family (#8785)
FourGamingStudio(123074279+FourGamingStudio@users.noreply.github.com) in 2023-07-01

add sides to HoverPart (#8784)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-07-01

Fixed pathfinding not being able to attack towards solid blocks
Anuken(arnukren@gmail.com) in 2023-06-30

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-30

Fixed #8782
Anuken(arnukren@gmail.com) in 2023-06-30

[XCore] Anarchy server (#8779)
OSP(76648940+osp54@users.noreply.github.com) in 2023-06-29

Update servers_v7.json (#8776)
Gureumi(44261958+Kieaer@users.noreply.github.com) in 2023-06-29

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-29

Fixed #8777
Anuken(arnukren@gmail.com) in 2023-06-29

Update UnitType.java (#8778)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-29

Update bundle_ru.properties (#8770)
Slotterleet(62336673+Slotterleet@users.noreply.github.com) in 2023-06-28

Update RegenProjector.java (#8768)
Uenhe(119563256+Uenhe@users.noreply.github.com) in 2023-06-28

mesh fix 2
Anuken(arnukren@gmail.com) in 2023-06-27

mesh fix
Anuken(arnukren@gmail.com) in 2023-06-27

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-27

Closes Anuken/Mindustry-Suggestions/issues/4499
Anuken(arnukren@gmail.com) in 2023-06-27

New Ru translations (#8755)
Sunky.MP3G(125795960+SunkyMP3G@users.noreply.github.com) in 2023-06-28

Fixed #8764
Anuken(arnukren@gmail.com) in 2023-06-27

Fixed #8762
Anuken(arnukren@gmail.com) in 2023-06-27

Fixed #8760
Anuken(arnukren@gmail.com) in 2023-06-26

Fixed #8759
Anuken(arnukren@gmail.com) in 2023-06-26

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-25

Fixed #8757
Anuken(arnukren@gmail.com) in 2023-06-25

Update contributors
Anuken(arnukren@gmail.com) in 2023-06-25

Update bundle_de.properties (#8754)
Lime712(122940036+Lime712@users.noreply.github.com) in 2023-06-26

Update bundle_de.properties (#8753)
Lime712(122940036+Lime712@users.noreply.github.com) in 2023-06-25

Decreased canvas silicon cost
Anuken(arnukren@gmail.com) in 2023-06-24

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-23

Cleanup output stream
Anuken(arnukren@gmail.com) in 2023-06-23

Add priority servers, update servers_v7.json (#8720)
router(messagebus@vk.com) in 2023-06-23

Update contributors (#8748)
Somka000(51973243+Somka000@users.noreply.github.com) in 2023-06-22

Fixed #8742
Anuken(arnukren@gmail.com) in 2023-06-22

arc
Anuken(arnukren@gmail.com) in 2023-06-22

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-21

Less pierce damage for shocked status
Anuken(arnukren@gmail.com) in 2023-06-21

add getEmoji() method (#8739)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-21

fix (#8736)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-21

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-20

Fixed #8735
Anuken(arnukren@gmail.com) in 2023-06-20

Update bug_report.yml
Anuken(arnukren@gmail.com) in 2023-06-20

Turn Issue Templates into Issue Forms for better structure (#8734)
夜狐(108625654+Yoru-Kitsune@users.noreply.github.com) in 2023-06-20

Fixed #8733
Anuken(arnukren@gmail.com) in 2023-06-20

Fixed non-even assembler modules not working
Anuken(arnukren@gmail.com) in 2023-06-19

Fixed #8732
Anuken(arnukren@gmail.com) in 2023-06-19

Pathfinding improvements
Anuken(arnukren@gmail.com) in 2023-06-19

Fixed #8729
Anuken(arnukren@gmail.com) in 2023-06-19

Conduit padCorners fix
Anuken(arnukren@gmail.com) in 2023-06-19

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-19

Conduit padCorners
Anuken(arnukren@gmail.com) in 2023-06-19

Fix invalid heal targeting for non-sharded teams (#8728)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-19

Fixed Grammar Error on TR Bundle (#8727)
RTOmega(62565267+RebornTrack970@users.noreply.github.com) in 2023-06-18

.
Anuken(arnukren@gmail.com) in 2023-06-18

Fixed #8718
Anuken(arnukren@gmail.com) in 2023-06-18

Do not crash when reading null planets
Anuken(arnukren@gmail.com) in 2023-06-17

Fixed reconstructor commanding in multiplayer
Anuken(arnukren@gmail.com) in 2023-06-17

Misc fixes
Anuken(arnukren@gmail.com) in 2023-06-17

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-17

Quieter build sound / Display player name on hovered unit
Anuken(arnukren@gmail.com) in 2023-06-17

Automatic bundle update
Github Actions(runner@fv-az354-109.wyswqxu4gagu3ld0braovpisna.bx.internal.cloudapp.net) in 2023-06-17

Update french translations (#8715)
Phinner(62483793+Phinner@users.noreply.github.com) in 2023-06-17

Automatic bundle update
Github Actions(runner@fv-az792-653.lvz11p3rpiaudhre3wekhh4ggb.dx.internal.cloudapp.net) in 2023-06-17

Update bundle_pt_BR.properties (#8687)
red(80164245+gabriel-fondato@users.noreply.github.com) in 2023-06-16

lockRotation
Anuken(arnukren@gmail.com) in 2023-06-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-16

Misc fixes
Anuken(arnukren@gmail.com) in 2023-06-16

Lock rotation of blocks with `rotate = false` to 0 (#8531)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-06-16

Allow ulocate to output enemy buildings (#6704)
BalaM314(71201189+BalaM314@users.noreply.github.com) in 2023-06-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-16

Conduit junction replacement fix
Anuken(arnukren@gmail.com) in 2023-06-16

Automatic bundle update
Github Actions(runner@fv-az301-492.fek51roil0iefemchihbrraurb.jx.internal.cloudapp.net) in 2023-06-16

Update bundle_th.properties (#8714)
JniTrRny(85090668+JniTrRny@users.noreply.github.com) in 2023-06-16

Update bundle_be.properties (#8697)
Tornado3708(107116054+Tornado3708@users.noreply.github.com) in 2023-06-16

Laser pierce fixes. (#8526)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-06-15

Update CoreBlock.java (#8583)
WayZer(himc.wicp@gmail.com) in 2023-06-16

Better handling of missiles splitting to other missiles (#8603)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-06-15

new CreateDustry IP (#8713)
Alexander397172YT(76264974+Alexander397172YT@users.noreply.github.com) in 2023-06-15

Automatic bundle update
Github Actions(runner@fv-az477-978.1yxiukuhuyuebe1tewsldqkqqh.phxx.internal.cloudapp.net) in 2023-06-14

Update servers_v7.json (#8712)
BeDanGames(92419640+BeDanGames@users.noreply.github.com) in 2023-06-14

Team improvements (#8704)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-14

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-13

Fixed #8710
Anuken(arnukren@gmail.com) in 2023-06-13

Correctly display ∞ unit cap in reconstructors (#8709)
BalaM314(71201189+BalaM314@users.noreply.github.com) in 2023-06-13

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-13

Show locked item names
Anuken(arnukren@gmail.com) in 2023-06-13

Update Darkdustry address :skull: (#8707)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-13

Fixed logic blocks making clicking noises when not accessible
Anuken(arnukren@gmail.com) in 2023-06-12

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-12

Fixed objective flags not syncing
Anuken(arnukren@gmail.com) in 2023-06-12

Automatic bundle update
Github Actions(runner@fv-az411-1.3o3m4cib2vcuvgqhi5dgwulx3d.bx.internal.cloudapp.net) in 2023-06-12

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-12

e
Anuken(arnukren@gmail.com) in 2023-06-12

Update servers_v7.json (#8702)
WayZer(himc.wicp@gmail.com) in 2023-06-12

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-11

Cleanup
Anuken(arnukren@gmail.com) in 2023-06-11

Automatic bundle update
Github Actions(runner@fv-az577-705.at4cxwiy2cwe3mwsxn423cheea.dx.internal.cloudapp.net) in 2023-06-12

Admin player team switch + more trace info
Anuken(arnukren@gmail.com) in 2023-06-11

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-11

Networking fix
Anuken(arnukren@gmail.com) in 2023-06-11

Update Team.java (#8700)
NullReferenceExc(65529860+NullReferenceExc@users.noreply.github.com) in 2023-06-10

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-10

Fixed #8698
Anuken(arnukren@gmail.com) in 2023-06-10

GMS shutting down (removing GMS servers from server list) (#8696)
VaporSpace2(92970384+VaporSpace2@users.noreply.github.com) in 2023-06-09

Update bundle_zh_CN.properties (#8692)
qwertystar(z000000022222222@sina.cn) in 2023-06-09

arc
Anuken(arnukren@gmail.com) in 2023-06-08

Merge branch 'master' of https://github.com/Anuken/Mindustry
Anuken(arnukren@gmail.com) in 2023-06-08

arc
Anuken(arnukren@gmail.com) in 2023-06-08

Update bundle_de.properties (#8688)
夜狐(108625654+Yoru-Kitsune@users.noreply.github.com) in 2023-06-08

fix a small mistake made by inattention (#8686)
Valera(76255437+xzxADIxzx@users.noreply.github.com) in 2023-06-08

:skull: (#8685)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-07

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-07

Closes Anuken/Mindustry-Suggestions/issues/4452
Anuken(arnukren@gmail.com) in 2023-06-07

Map improvements (#8682)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-07

Update servers_v7.json (#8677)
xem8k5(69492624+xem8k5@users.noreply.github.com) in 2023-06-07

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-06

Fixed #8680
Anuken(arnukren@gmail.com) in 2023-06-06

replace aa server (#8679)
bendn(bend.n@outlook.com) in 2023-06-06

Automatic bundle update
Github Actions(runner@fv-az370-684.3txz4wqopyzepmqexx20lynywb.cx.internal.cloudapp.net) in 2023-06-05

Update bundle_fr.properties (#8678)
Ninjdai(65647523+Ninjdai1@users.noreply.github.com) in 2023-06-05

Side-based liquid tile padding (#8676)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-06-05

Automatic bundle update
Github Actions(runner@fv-az851-290.v2bpltdhm4pedh1m2mfzcuqzjb.cx.internal.cloudapp.net) in 2023-06-05

Better votekick reason input (#8673)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-05

Adapt interface to display notch of mac laptops (#8666)
Alex Gusev(alx.gsv@gmail.com) in 2023-06-04

Remove the rulebreaker (#8672)
Semetrix(73433905+Semetrix@users.noreply.github.com) in 2023-06-04

Improvement on votekick (#8664)
frieda666(103875616+frieda666@users.noreply.github.com) in 2023-06-03

augh
Anuken(arnukren@gmail.com) in 2023-06-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-03

ServerConnectFilter
Anuken(arnukren@gmail.com) in 2023-06-03

Automatic bundle update
Github Actions(runner@fv-az612-82.gqp4uj4dnjkevoqu2sjlt0n5ta.cx.internal.cloudapp.net) in 2023-06-03

Update servers_v7.json (#8669)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-03

Fixed #8667
Anuken(arnukren@gmail.com) in 2023-06-03

Update Vietnamese translation (#8663)
SITUVNgcd(44901211+SITUVNgcd@users.noreply.github.com) in 2023-06-03

Ignore processing players kicked in event
Anuken(arnukren@gmail.com) in 2023-06-03

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-03

Fixed #8658
Anuken(arnukren@gmail.com) in 2023-06-03

Updated servers_v7.json - switching hosts (#8660)
Brandons404(43156510+Brandons404@users.noreply.github.com) in 2023-06-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-02

Fixed #8659
Anuken(arnukren@gmail.com) in 2023-06-02

Automatic bundle update
Github Actions(runner@fv-az1098-363.kwci34kuoiqujmqxcbtwd0ituc.cx.internal.cloudapp.net) in 2023-06-02

Closes Anuken/Mindustry-Suggestions/issues/4457
Anuken(arnukren@gmail.com) in 2023-06-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-06-02

Closes Anuken/Mindustry-Suggestions/issues/4456
Anuken(arnukren@gmail.com) in 2023-06-02

Dynamic selection of planet tech in rules dialog (#8487)
Slotterleet(62336673+Slotterleet@users.noreply.github.com) in 2023-06-02

Automatic bundle update
Github Actions(runner@fv-az1236-155.mlxw3kumjgxepk310yhxrkxswa.cx.internal.cloudapp.net) in 2023-06-02

Improvements to the Schematics UI (#8605)
JniTrRny(85090668+JniTrRny@users.noreply.github.com) in 2023-06-02

Update servers_v7.json (#8656)
ulwepo(85295540+ulwepo@users.noreply.github.com) in 2023-06-03

Make PlayerInfo map public (#8655)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-06-01

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-31

Fixed #8653
Anuken(arnukren@gmail.com) in 2023-05-31

Inversion option for payload router sorting (#8652)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-30

Bugfixes for reconstructor config
Anuken(arnukren@gmail.com) in 2023-05-30

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-30

Select command from reconstructor / Units save command when controlled
Anuken(arnukren@gmail.com) in 2023-05-30

Update servers_v7.json (#8651)
Tentyanuk(91948148+SSTentacleSS@users.noreply.github.com) in 2023-05-29

Load content icons on a headless server (#8650)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-05-29

Fixed #8649
Anuken(arnukren@gmail.com) in 2023-05-29

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-28

Misc minor bugfixes
Anuken(arnukren@gmail.com) in 2023-05-28

Allow Universe to update all solar systems (#8647)
GlennFolker(63218676+GlennFolker@users.noreply.github.com) in 2023-05-28

Spinning FlareParts (#8637)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-27

Fix Scaling on Objective Dialogs (#8646)
[Error_27](error27dev@gmail.com) in 2023-05-27

Fixed Base AI not working sometimes
Anuken(arnukren@gmail.com) in 2023-05-27

Add some servers (#8640)
thedimas(51395517+thedimas3007@users.noreply.github.com) in 2023-05-27

fix assetsJar (#8641)
WayZer(himc.wicp@gmail.com) in 2023-05-27

Don't show ghosts when typing in chat (#8644)
buthed010203(naguiar010203@gmail.com) in 2023-05-26

Fixed squished logic icons
Anuken(arnukren@gmail.com) in 2023-05-26

Buffer gone
Anuken(arnukren@gmail.com) in 2023-05-25

Stack router fix
Anuken(arnukren@gmail.com) in 2023-05-25

near is further again
Anuken(arnukren@gmail.com) in 2023-05-25

Fixed turrets with moveWhileCharging = true and accurateDelay = true
Anuken(arnukren@gmail.com) in 2023-05-24

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-24

Fixed #8632
Anuken(arnukren@gmail.com) in 2023-05-24

Update bundle_cs.properties (#8639)
YozoZChomutova(55143954+yozozchomutova@users.noreply.github.com) in 2023-05-24

Update bundle_ru.properties (#8638)
The Serjio(84933638+TheSerjio@users.noreply.github.com) in 2023-05-24

Add test case for achievement (#8633)
frieda666(103875616+frieda666@users.noreply.github.com) in 2023-05-23

new server CreateDustry v7 (#8631)
Alexander397172YT(76264974+Alexander397172YT@users.noreply.github.com) in 2023-05-23

New scorch sprite by Fox1va_
Anuken(arnukren@gmail.com) in 2023-05-22

Fixed mod startup crash
Anuken(arnukren@gmail.com) in 2023-05-22

Closes Anuken/Mindustry-Suggestions/issues/4433
Anuken(arnukren@gmail.com) in 2023-05-22

Faster connection lookup
Anuken(arnukren@gmail.com) in 2023-05-22

Possible crash fix
Anuken(arnukren@gmail.com) in 2023-05-21

arc
Anuken(arnukren@gmail.com) in 2023-05-21

Logic sprite upper limit now 64
Anuken(arnukren@gmail.com) in 2023-05-21

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-21

Interplanetary accelerator hidden in database
Anuken(arnukren@gmail.com) in 2023-05-21

fixup! Fix Turret bug when `cheat` (#8273) (#8629)
WayZer(himc.wicp@gmail.com) in 2023-05-21

pain
Anuken(arnukren@gmail.com) in 2023-05-21

fixed iOS crash
Anuken(arnukren@gmail.com) in 2023-05-21

Team#isEnemy is pointless
Anuken(arnukren@gmail.com) in 2023-05-21

Always hide content when isHidden() == true
Anuken(arnukren@gmail.com) in 2023-05-21

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-20

Pathfinder fixes / Hail resprite by Snake#2132 on Discord
Anuken(arnukren@gmail.com) in 2023-05-20

Chained PartProgress Operation in Json (#8627)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-19

Interval bullets for continuous bullets (#8628)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-19

typo
Anuken(arnukren@gmail.com) in 2023-05-19

Load logger in iOS
Anuken(arnukren@gmail.com) in 2023-05-19

Removed redundant team checks
Anuken(arnukren@gmail.com) in 2023-05-19

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-19

Ripple tint change / Minor optimization
Anuken(arnukren@gmail.com) in 2023-05-19

Shift swarmer shoot barrels to match the chutes (#8624)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-19

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-19

Fixed #8622
Anuken(arnukren@gmail.com) in 2023-05-19

swarmer resprite? (#8573)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-05-19

Map list fixes on phones
Anuken(arnukren@gmail.com) in 2023-05-18

Less MeshBuilder memory usage
Anuken(arnukren@gmail.com) in 2023-05-18

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-18

Scatter resprite (By Daz from Discord)
Anuken(arnukren@gmail.com) in 2023-05-18

insanius (#8621)
Ilya246(57039557+Ilya246@users.noreply.github.com) in 2023-05-18

Vanilla base walls only
Anuken(arnukren@gmail.com) in 2023-05-18

Tecta buff / Closes Anuken/Mindustry-Suggestions/issues/4427
Anuken(arnukren@gmail.com) in 2023-05-18

Some more random schematics
Anuken(arnukren@gmail.com) in 2023-05-17

New base schematcs from Bluewolf
Anuken(arnukren@gmail.com) in 2023-05-17

New salvo sprite
Anuken(arnukren@gmail.com) in 2023-05-17

near is further
Anuken(arnukren@gmail.com) in 2023-05-17

near is nearer
Anuken(arnukren@gmail.com) in 2023-05-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-16

More core units for bases
Anuken(arnukren@gmail.com) in 2023-05-16

Automatic bundle update
Github Actions(runner@fv-az267-61.nxcb3hbm2g0uvici5xyl5r3zah.dx.internal.cloudapp.net) in 2023-05-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-16

Base building AI is back
Anuken(arnukren@gmail.com) in 2023-05-16

Update servers_v7.json (#8615)
Tentyanuk(91948148+SSTentacleSS@users.noreply.github.com) in 2023-05-16

augh
Anuken(arnukren@gmail.com) in 2023-05-16

arc
Anuken(arnukren@gmail.com) in 2023-05-16

Log zenity error
Anuken(arnukren@gmail.com) in 2023-05-16

Made default CacheLayer add method insert before 'normal'
Anuken(arnukren@gmail.com) in 2023-05-15

Native (Zenity) file dialogs for Linux
Anuken(arnukren@gmail.com) in 2023-05-15

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-15

Ignore null messages
Anuken(arnukren@gmail.com) in 2023-05-15

Move most planet rendering out of PlanetRenderer to Planet (#8608)
GlennFolker(63218676+GlennFolker@users.noreply.github.com) in 2023-05-15

Update bundle_cs.properties (#8610)
Vojtak42(Vojtak42@email.cz) in 2023-05-15

Update servers_v7.json (#8611)
BeDanGames(92419640+BeDanGames@users.noreply.github.com) in 2023-05-15

Update servers_v7.json (#8606)
HamzaGSopp(104453337+HamzaGSopp@users.noreply.github.com) in 2023-05-14

Latest RoboVM
Anuken(arnukren@gmail.com) in 2023-05-13

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-13

Fixed #8602
Anuken(arnukren@gmail.com) in 2023-05-13

Use shouldExplode, explosionMinWarmup in generators (#8600)
BalaM314(71201189+BalaM314@users.noreply.github.com) in 2023-05-13

Fix crash (#8599)
buthed010203(naguiar010203@gmail.com) in 2023-05-13

Update SERVERLIST.md
Anuken(arnukren@gmail.com) in 2023-05-13

Noise filter fix
Anuken(arnukren@gmail.com) in 2023-05-12

why was this here
Anuken(arnukren@gmail.com) in 2023-05-12

Better VariableReactorBuild explosion check
Anuken(arnukren@gmail.com) in 2023-05-12

Fixed #8587
Anuken(arnukren@gmail.com) in 2023-05-12

Neoplasia reactor rebuildable
Anuken(arnukren@gmail.com) in 2023-05-12

Fixed map list dialog
Anuken(arnukren@gmail.com) in 2023-05-12

Gas sprite revert
Anuken(arnukren@gmail.com) in 2023-05-12

Revert "Properly handle missile units shooting more missile units (#8359)" (#8585)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-11

fix NPE in SpawnGroup.write (#8584)
WayZer(himc.wicp@gmail.com) in 2023-05-12

Fixed #8582
Anuken(arnukren@gmail.com) in 2023-05-11

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-11

Minor cleanup
Anuken(arnukren@gmail.com) in 2023-05-11

Automatic bundle update
Github Actions(runner@fv-az341-636.0ncbme5hdzxejb0zwlqaqqxy4e.dx.internal.cloudapp.net) in 2023-05-11

Mobile rebuild button support
Anuken(arnukren@gmail.com) in 2023-05-11

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-11

Better utilization of JoinDialog UI space
Anuken(arnukren@gmail.com) in 2023-05-11

Update French translation (#8579)
Phinner(62483793+Phinner@users.noreply.github.com) in 2023-05-11

Fixed map alignment
Anuken(arnukren@gmail.com) in 2023-05-11

Reverted name change to un-break mods
Anuken(arnukren@gmail.com) in 2023-05-11

Disabled annoying X scrolling in map dialogs
Anuken(arnukren@gmail.com) in 2023-05-11

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-11

Merged Custom/editor maps implementation
Anuken(arnukren@gmail.com) in 2023-05-11

PartMove progress is ignored for growth (#8580)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-10

RegionPart movement should not be affected by growth scale (#8578)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-10

Add BlockRotateEvent (#8577)
Phinner(62483793+Phinner@users.noreply.github.com) in 2023-05-11

Fixed JSON sector preset files failing to load
Anuken(arnukren@gmail.com) in 2023-05-10

Minor DrawPistons fix
Anuken(arnukren@gmail.com) in 2023-05-10

Horizontal shifting of pistons (also adds proper icons for pistons) (#8345)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-10

Cleanup
Anuken(arnukren@gmail.com) in 2023-05-10

Cleanup
Anuken(arnukren@gmail.com) in 2023-05-10

Better planet selection (#8572)
xStaBUx(96493687+xStaBUx@users.noreply.github.com) in 2023-05-10

Ser-pew-lo Turret Animations (#8562)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-10

sendUnformatted method in PlayerComp (#8575)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-05-10

Placeable overlays
Anuken(arnukren@gmail.com) in 2023-05-10

Allow placing floors (for mods)
Anuken(arnukren@gmail.com) in 2023-05-10

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-10

bigger numbers
Anuken(arnukren@gmail.com) in 2023-05-10

Properly handle missile units shooting more missile units (#8359)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-09

Revert Math.max in shakeReduction (#8570)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-09

Smoother Screenshake Reduction (#8310)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-08

Attempt healing targetting even if the bullet doesn't collide with ground targets (#8516)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-08

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-08

Canvas block schematic preview
Anuken(arnukren@gmail.com) in 2023-05-08

Possible parser status effect fix
Anuken(arnukren@gmail.com) in 2023-05-08

Update servers_v7.json (#8568)
HamzaGSopp(104453337+HamzaGSopp@users.noreply.github.com) in 2023-05-08

Automatic bundle update
Github Actions(runner@fv-az409-178.gl4i0ri3y5wexlajmgvk5xoqed.jx.internal.cloudapp.net) in 2023-05-07

Fix some Italian translations (#8564)
Mario A(10923513+Midblyte@users.noreply.github.com) in 2023-05-07

Search bar for wave UI (#8501)
JniTrRny(85090668+JniTrRny@users.noreply.github.com) in 2023-05-07

Automatic bundle update
Github Actions(runner@fv-az493-487.qfcvxp31ax1ubi3tmrxi40i00f.phxx.internal.cloudapp.net) in 2023-05-07

gas sprites (ark too ig) (#8528)
nullevoy(89076920+stacktrace-error@users.noreply.github.com) in 2023-05-07

Wave limit game rule in custom maps (#8550)
JniTrRny(85090668+JniTrRny@users.noreply.github.com) in 2023-05-07

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-05-06

unitHealth in logic
Anuken(arnukren@gmail.com) in 2023-05-06

Automatic bundle update
Github Actions(runner@fv-az749-89.2a4ej054p0kepnojclvjwvpm2f.cx.internal.cloudapp.net) in 2023-05-07

Fix some mistakes in German translation (#8543)
Philipp(34287258+Phippe@users.noreply.github.com) in 2023-05-07

New translation (#8555)
Prosta4okua(danyavdele@gmail.com) in 2023-05-07

Update servers_v7.json (#8556)
HamzaGSopp(104453337+HamzaGSopp@users.noreply.github.com) in 2023-05-07

Update russian bundle (#8559)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-05-07

update german translation (#8560)
Catchears(57631841+Catchears@users.noreply.github.com) in 2023-05-07

A couple of features for better planet modding (#8558)
Slotterleet(62336673+Slotterleet@users.noreply.github.com) in 2023-05-07

Clear invalid payload ammo (#8544)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-05-06

Gradle opt -PnoLocalArc to force no localArc (#8552)
BalaM314(71201189+BalaM314@users.noreply.github.com) in 2023-05-07

Fix override of Building.block in PayloadSource (#8551)
BalaM314(71201189+BalaM314@users.noreply.github.com) in 2023-05-07

Fixed #8557
Anuken(arnukren@gmail.com) in 2023-05-06

Doubled max schematic size
Anuken(arnukren@gmail.com) in 2023-05-06

Fixed power node linking in basegen
Anuken(arnukren@gmail.com) in 2023-05-05

Fixed invalid ranges for some weapons
Anuken(arnukren@gmail.com) in 2023-05-05

unitHealthMultiplier re-implemented
Anuken(arnukren@gmail.com) in 2023-05-03

Update bundle_ca.properties (#8542)
Joan Josep(juanjo.ng.83@gmail.com) in 2023-04-29

tests are no longer stupid
Anuken(arnukren@gmail.com) in 2023-04-28

and these other weapons too
Anuken(arnukren@gmail.com) in 2023-04-28

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-28

PointDefenseWeapon no longer affects range
Anuken(arnukren@gmail.com) in 2023-04-28

[XCore] Mini Attack server + reserve server (#8530)
OSP(76648940+osp54@users.noreply.github.com) in 2023-04-28

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-28

Fixed #8533
Anuken(arnukren@gmail.com) in 2023-04-28

warmup and totalProgress for Pumps (#8536)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-28

Automatic bundle update
Github Actions(runner@fv-az298-502.syazwzzmnolutc2p1qz3stsjqd.jx.internal.cloudapp.net) in 2023-04-28

Update bundle_th.properties (#8532)
JniTrRny(85090668+JniTrRny@users.noreply.github.com) in 2023-04-28

new ip (#8534)
Tomoko(65737359+Taras4k@users.noreply.github.com) in 2023-04-28

Fixed #8529
Anuken(arnukren@gmail.com) in 2023-04-28

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-24

Logic pathfind instruction
Anuken(arnukren@gmail.com) in 2023-04-24

Don't set lighting if the preset has noLighting = true (#8519)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-21

update easyplay servers (#8521)
ienov(60543121+ienov@users.noreply.github.com) in 2023-04-22

Removed non-license notice from the end (#8524)
Богдан(za.boal@vk.com) in 2023-04-22

Fixed #8523
Anuken(arnukren@gmail.com) in 2023-04-21

Fixed #8525
Anuken(arnukren@gmail.com) in 2023-04-21

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-21

Fixed minimap update lag
Anuken(arnukren@gmail.com) in 2023-04-21

splashDamagePierce
Anuken(arnukren@gmail.com) in 2023-04-20

Erekir payload conveyor sprite consistency (#8506)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-18

Update server_v7.json:add new server (#8512)
lemon3357(126368248+lemon3357@users.noreply.github.com) in 2023-04-18

Add overlays to render updates (#8514)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-18

Fixed #8513
Anuken(arnukren@gmail.com) in 2023-04-18

Load saves in parallel
Anuken(arnukren@gmail.com) in 2023-04-18

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-16

Use schematic/map names for filenames
Anuken(arnukren@gmail.com) in 2023-04-16

Update servers_v7.json (#8508)
lemon3357(126368248+lemon3357@users.noreply.github.com) in 2023-04-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-15

Fixed #8509
Anuken(arnukren@gmail.com) in 2023-04-15

Update servers_v7.json - added sandbox server (#8504)
Brandons404(43156510+Brandons404@users.noreply.github.com) in 2023-04-15

Automatic bundle update
Github Actions(runner@fv-az1135-506.25hvilmf13uujdrichs2h1wmkg.bx.internal.cloudapp.net) in 2023-04-16

vps changed ip (#8510)
BotiHUN7(37449434+BotiHUN7@users.noreply.github.com) in 2023-04-16

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-15

Fixed #8507
Anuken(arnukren@gmail.com) in 2023-04-15

Rework (#8488)
MonoDx(87523240+monodevx@users.noreply.github.com) in 2023-04-16

Remove mindustry.party (#8511)
Noah van der Aa(ndvdaa@gmail.com) in 2023-04-16

Minimap attack indicators
Anuken(arnukren@gmail.com) in 2023-04-15

Display camera on map + right-click to pan
Anuken(arnukren@gmail.com) in 2023-04-15

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-09

Fixed #8496
Anuken(arnukren@gmail.com) in 2023-04-09

Ammo obliteration (#8498)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-09

Update CN Ports (#8499)
L0615T1C5-216AC-9437(60281819+L0615T1C5-216AC-9437@users.noreply.github.com) in 2023-04-09

Fixed #8495
Anuken(arnukren@gmail.com) in 2023-04-09

Fixed #8494
Anuken(arnukren@gmail.com) in 2023-04-09

Fixed objectives disappearing for no reason
Anuken(arnukren@gmail.com) in 2023-04-08

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-08

Fixed shoot pattern overrides not working in mods
Anuken(arnukren@gmail.com) in 2023-04-08

New Darkdustry host (#8492)
Даркнесс#3729(79508138+Darkness6030@users.noreply.github.com) in 2023-04-08

PR cleanup
Anuken(arnukren@gmail.com) in 2023-04-08

Reset UI scale to 100% when broken
Anuken(arnukren@gmail.com) in 2023-04-08

Fixed #8483 (meep why did you make the minimum 5%)
Anuken(arnukren@gmail.com) in 2023-04-07

Doubled server object buffer size
Anuken(arnukren@gmail.com) in 2023-04-07

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-06

Better item display rates
Anuken(arnukren@gmail.com) in 2023-04-06

Automatic bundle update
Github Actions(runner@fv-az1028-301.atwrdzpjfxuexoqyq1q1ta0xqe.cx.internal.cloudapp.net) in 2023-04-06

More Dark UI in stats display (#8473)
JniTrRny(85090668+JniTrRny@users.noreply.github.com) in 2023-04-07

Add PlayerChatEvent on clients (#8432)
code-explorer786(68312688+code-explorer786@users.noreply.github.com) in 2023-04-07

Fixed #8480
Anuken(arnukren@gmail.com) in 2023-04-06

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-06

Optimized imports
Anuken(arnukren@gmail.com) in 2023-04-06

Automatic bundle update
Github Actions(runner@fv-az336-5.34vzfazclkletheg0wkc3slrva.gx.internal.cloudapp.net) in 2023-04-06

Update bundle_ko.properties (#8479)
Nunting(77824588+Nunting@users.noreply.github.com) in 2023-04-06

Update bundle_be.properties (#8478)
MonoDx(87523240+monodevx@users.noreply.github.com) in 2023-04-06

Update push.yml
Anuken(arnukren@gmail.com) in 2023-04-05

Removed pointless code
Anuken(arnukren@gmail.com) in 2023-04-05

New duo animation
Anuken(arnukren@gmail.com) in 2023-04-04

Fixed some possible crashes
Anuken(arnukren@gmail.com) in 2023-04-03

Multi shotgun fix (#8460)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-03

Fix multiline messages being cut off (#8471)
buthed010203(naguiar010203@gmail.com) in 2023-04-03

Fix janky sublimate ammo display (#8469)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-03

Update servers_v7.json (#8468)
DikHalz(87813567+DikHalz@users.noreply.github.com) in 2023-04-02

Classmap auto-update
Anuken(arnukren@gmail.com) in 2023-04-02

Parse singular consumes (#8466)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-02

Fixed #8465
Anuken(arnukren@gmail.com) in 2023-04-02

Update bundle_ca.properties (#8464)
Joan Josep(juanjo.ng.83@gmail.com) in 2023-04-02

Fixed #8462
Anuken(arnukren@gmail.com) in 2023-04-02

Fixed #8463
Anuken(arnukren@gmail.com) in 2023-04-02

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-02

Fixed team write error
Anuken(arnukren@gmail.com) in 2023-04-02

Proper speedup amount (#8461)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-04-01

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-01

Hide weapon sprites for certain units
Anuken(arnukren@gmail.com) in 2023-04-01

Update bundle_de.properties (#8452)
Bernd Ritter(commel@users.noreply.github.com) in 2023-04-01

Fixed #8458
Anuken(arnukren@gmail.com) in 2023-04-01

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-04-01

battery fix
Anuken(arnukren@gmail.com) in 2023-04-01

Fixing menu not hiding on click. (#8455)
Xasmedy(75242213+Xasmedy@users.noreply.github.com) in 2023-04-01

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-03-31

JSON planet cloudMesh/HexSkyMesh support
Anuken(arnukren@gmail.com) in 2023-03-31

Automatic bundle update
Github Actions(runner@fv-az562-456.uxtbn4doda5ujidlousdb0p40b.cx.internal.cloudapp.net) in 2023-04-01

Setprop description
Anuken(arnukren@gmail.com) in 2023-03-31

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-03-31

Better impl of #8451
Anuken(arnukren@gmail.com) in 2023-03-31

Update contributors (#8450)
Xasmedy(75242213+Xasmedy@users.noreply.github.com) in 2023-03-31

Adding a new menu type. (#8449)
Xasmedy(75242213+Xasmedy@users.noreply.github.com) in 2023-03-31

bridgeReplacement for ducts (#8447)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-03-30

Update Xpdustry servers (#8446)
Phinner(62483793+Phinner@users.noreply.github.com) in 2023-03-30

Update servers_v7.json (#8443)
Volas171(volas@mindustry.me) in 2023-03-28

Update servers_v7.json (#8441)
Suportik-GFX(68199596+Suportik-GFX@users.noreply.github.com) in 2023-03-28

Fixed RadialEffect + MultiEffect
Anuken(arnukren@gmail.com) in 2023-03-27

might as well blacklist it in the game too
Anuken(arnukren@gmail.com) in 2023-03-27

Fixed #8435
Anuken(arnukren@gmail.com) in 2023-03-27

Closes Anuken/Mindustry-Suggestions/issues/4353
Anuken(arnukren@gmail.com) in 2023-03-26

Merge remote-tracking branch 'origin/master'
Anuken(arnukren@gmail.com) in 2023-03-26

Multi-line server list
Anuken(arnukren@gmail.com) in 2023-03-26

(Optionally) Scale efficiency of attribute crafters (#8433)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-03-26

Fix frags in frags creating a large empty space (#8430)
MEEPofFaith(54301439+MEEPofFaith@users.noreply.github.com) in 2023-03-26

Automatic bundle update
Github Actions(runner@fv-az642-342.cqpvgpoo3osu5lvmex0g05djkf.phxx.internal.cloudapp.net) in 2023-03-26

Better Ammo St…
  • Loading branch information
@way-zer
way-zer committed Apr 20, 2024
1 parent 3a29d21 commit 33313d9
Show file tree
Hide file tree
Showing 35 changed files with 2,167 additions and 1,784 deletions.
40 changes: 14 additions & 26 deletions patches/client/0019-C-RenderExt-researchViewer.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
core/src/mindustry/game/Objectives.java | 4 +++-
core/src/mindustry/ui/dialogs/ResearchDialog.java | 12 ++++++------
core/src/mindustryX/features/RenderExt.java | 2 ++
3 files changed, 11 insertions(+), 7 deletions(-)
core/src/mindustry/game/Objectives.java | 4 +++-
core/src/mindustry/ui/dialogs/ResearchDialog.java | 9 +++++----
core/src/mindustryX/features/RenderExt.java | 2 ++
3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/game/Objectives.java b/core/src/mindustry/game/Objectives.java
index f50c8c0ca180f07cc2ce13068540910c915189d5..fbb783f85810db49bd6a321d729f5214fd0d22b3 100644
Expand Down Expand Up @@ -43,7 +43,7 @@ index f50c8c0ca180f07cc2ce13068540910c915189d5..fbb783f85810db49bd6a321d729f5214
}

diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java
index a251419f31092b68aca9fd756f19e8c3602263d4..b48434c90924d17f8cd671e01159b6f8e294718f 100644
index a251419f31092b68aca9fd756f19e8c3602263d4..59e3d7507a1161e9120b71d9f11ba02a501a796b 100644
--- a/core/src/mindustry/ui/dialogs/ResearchDialog.java
+++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java
@@ -27,6 +27,7 @@ import mindustry.type.*;
Expand All @@ -54,37 +54,25 @@ index a251419f31092b68aca9fd756f19e8c3602263d4..b48434c90924d17f8cd671e01159b6f8

import java.util.*;

@@ -350,10 +351,9 @@ public class ResearchDialog extends BaseDialog{
@@ -349,7 +350,7 @@ public class ResearchDialog extends BaseDialog{
}

void checkNodes(TechTreeNode node){
boolean locked = locked(node.node);
- if(!locked && (node.parent == null || node.parent.visible)) node.visible = true;
+ node.visible = RenderExt.researchViewer || !locked && (node.parent == null || node.parent.visible);
- boolean locked = locked(node.node);
+ boolean locked = !RenderExt.researchViewer && locked(node.node);
if(!locked && (node.parent == null || node.parent.visible)) node.visible = true;
node.selectable = selectable(node.node);
for(TechTreeNode l : node.children){
- l.visible = !locked && l.parent.visible;
checkNodes(l);
}

@@ -444,7 +444,7 @@ public class ResearchDialog extends BaseDialog{
}
});
button.hovered(() -> {
- if(!mobile && hoverNode != button && node.visible){
+ if(!mobile && hoverNode != button && (node.visible)){
hoverNode = button;
rebuild();
}
@@ -463,7 +463,7 @@ public class ResearchDialog extends BaseDialog{
@@ -463,7 +464,7 @@ public class ResearchDialog extends BaseDialog{
button.setPosition(node.x + panX + width / 2f, node.y + panY + height / 2f + offset, Align.center);
button.getStyle().up = !locked(node.node) ? Tex.buttonOver : !selectable(node.node) || !canSpend(node.node) ? Tex.buttonRed : Tex.button;

- ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable ? node.node.content.uiIcon : Icon.lock.getRegion());
+ ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable|| RenderExt.researchViewer ? node.node.content.uiIcon : Icon.lock.getRegion());
+ ((TextureRegionDrawable)button.getStyle().imageUp).setRegion(node.selectable || RenderExt.researchViewer ? node.node.content.uiIcon : Icon.lock.getRegion());
button.getImage().setColor(!locked(node.node) ? Color.white : node.selectable ? Color.gray : Pal.gray);
button.getImage().layout();
});
@@ -603,13 +603,13 @@ public class ResearchDialog extends BaseDialog{
@@ -603,13 +604,13 @@ public class ResearchDialog extends BaseDialog{
infoTable.table(b -> {
b.margin(0).left().defaults().left();

Expand All @@ -96,7 +84,7 @@ index a251419f31092b68aca9fd756f19e8c3602263d4..b48434c90924d17f8cd671e01159b6f8
b.table(desc -> {
desc.left().defaults().left();
- desc.add(selectable ? node.content.localizedName : "[accent]???");
+ desc.add(selectable ? node.content.localizedName : RenderExt.researchViewer ? node.content.localizedName+"\n[red]未满足前置科技":"[accent]???");
+ desc.add(selectable ? node.content.localizedName : RenderExt.researchViewer ? node.content.localizedName + "\n[red]未满足前置科技" : "[accent]???");
desc.row();
if(locked(node) || debugShowRequirements){

Expand Down
4 changes: 2 additions & 2 deletions patches/client/0024-C-StatExt.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ index 97aedf43b5595bcfb63ea9ecce91dc6e57967e92..cd30d93b35b0547658c39c0b0f6e5ef0

public class PointDefenseBuild extends ReloadTurretBuild{
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 9003d6e4c6afa463aec395590b7473a28d842a17..13d3a0ea2b54e19a6e61b23270ffb632a134dbca 100644
index 9003d6e4c6afa463aec395590b7473a28d842a17..f6866128bc39fdbf40d8e1b853ecc533ab5b9880 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -26,6 +26,7 @@ import mindustry.ui.*;
Expand All @@ -478,7 +478,7 @@ index 9003d6e4c6afa463aec395590b7473a28d842a17..13d3a0ea2b54e19a6e61b23270ffb632
stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees);
- stats.add(Stat.reload, 60f / (reload) * shoot.shots, StatUnit.perSecond);
+ int shoots = StatExt.totalShots(shoot);
+ stats.add(Stat.reload, "@@/s", shoots == 1 ? "" : shoots + " x ", Strings.autoFixed(60f / reload, 2) + "/s");
+ stats.add(Stat.reload, "@@/s", shoots == 1 ? "" : shoots + " x ", Strings.autoFixed(60f / reload, 2));
stats.add(Stat.targetsAir, targetAir);
stats.add(Stat.targetsGround, targetGround);
if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);
Expand Down
63 changes: 39 additions & 24 deletions patches/client/0027-C-claj.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,20 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Origin: squi2rel <501410836@qq.com>

add a paste button in claj dialog
Cong0707 <49234756+cong0707@users.noreply.github.com> on 2024/2/24 at 21:38

PausedDialog重排;修复一个潜在的claj代码输入bug
MinRi2 <2275045670@qq.com> on 2024/4/11 at 22:15
way-zer <himc.wicp@gmail.com> on 2024/4/13 at 19:18
---
.../src/mindustryX/features/InternalMods.java | 2 +
core/src/mindustryX/mods/claj/Claj.java | 37 +++++
.../mindustryX/mods/claj/ClajIntegration.java | 139 ++++++++++++++++++
.../mods/claj/dialogs/JoinViaClajDialog.java | 100 +++++++++++++
.../mods/claj/dialogs/JoinViaClajDialog.java | 108 ++++++++++++++
.../mods/claj/dialogs/ManageRoomsDialog.java | 99 +++++++++++++
5 files changed, 377 insertions(+)
5 files changed, 385 insertions(+)
create mode 100644 core/src/mindustryX/mods/claj/Claj.java
create mode 100644 core/src/mindustryX/mods/claj/ClajIntegration.java
create mode 100644 core/src/mindustryX/mods/claj/dialogs/JoinViaClajDialog.java
Expand Down Expand Up @@ -41,19 +48,18 @@ index 1ce00d17c712d417383a3d61f13e6f62e5d91adc..67e4cde70b0dbdc197cf8e9d5f12b5ae

diff --git a/core/src/mindustryX/mods/claj/Claj.java b/core/src/mindustryX/mods/claj/Claj.java
new file mode 100644
index 0000000000000000000000000000000000000000..1bbd1446ccd44e532df8ce542921d34ef3eadb5c
index 0000000000000000000000000000000000000000..40c5cf6f869fdfc8637f53480107b1b8b4f6c1c8
--- /dev/null
+++ b/core/src/mindustryX/mods/claj/Claj.java
@@ -0,0 +1,37 @@
+package mindustryX.mods.claj;
+
+import arc.scene.ui.layout.*;
+import arc.struct.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.mod.*;
+import mindustry.mod.Mods.*;
+import mindustryX.mods.claj.dialogs.JoinViaClajDialog;
+import mindustryX.mods.claj.dialogs.ManageRoomsDialog;
+import mindustryX.mods.claj.dialogs.*;
+
+public class Claj extends Plugin{
+ public JoinViaClajDialog joinViaClaj;
Expand All @@ -65,20 +71,21 @@ index 0000000000000000000000000000000000000000..1bbd1446ccd44e532df8ce542921d34e
+ joinViaClaj = new JoinViaClajDialog();
+ manageRooms = new ManageRoomsDialog();
+
+ Stack stack = (Stack)Vars.ui.join.getChildren().get(1);
+ Table root = (Table)stack.getChildren().get(1);
+
+ root.button("通过claj代码加入游戏", Icon.play, joinViaClaj::show);
+ if(!Vars.steam && !Vars.mobile) root.getCells().insert(4, root.getCells().remove(6));
+ else root.getCells().insert(3, root.getCells().remove(4));
+ Table buttons = Vars.ui.join.buttons;
+ buttons.button("通过claj代码加入游戏", Icon.play, joinViaClaj::show).self(cell -> {
+ Seq<Cell> cells = buttons.getCells();
+ cells.remove(cell);
+ cells.insert(3, cell); // 插入到占位元素前
+ });
+
+ var pausedDialog = Vars.ui.paused;
+ pausedDialog.shown(() -> {
+ if(Vars.mobile){
+ pausedDialog.cont.buttonRow("管理claj房间", Icon.planet, () -> manageRooms.show()).colspan(2).width(450f).disabled(b -> !Vars.net.server());
+ }else{
+ pausedDialog.cont.row().button("管理claj房间", Icon.planet, () -> manageRooms.show()).colspan(2).width(450f).disabled(b -> !Vars.net.server());
+ }
+ Table cont = pausedDialog.cont;
+
+ int columns = cont.getColumns();
+
+ cont.row();
+ cont.button("管理claj房间", Icon.planet, () -> manageRooms.show()).size(Float.NEGATIVE_INFINITY, 60).colspan(columns).fill().disabled(b -> !Vars.net.server());
+ });
+ }
+}
Expand Down Expand Up @@ -231,18 +238,22 @@ index 0000000000000000000000000000000000000000..e586f677e9d116407af2b0ccd47e7ab2
\ No newline at end of file
diff --git a/core/src/mindustryX/mods/claj/dialogs/JoinViaClajDialog.java b/core/src/mindustryX/mods/claj/dialogs/JoinViaClajDialog.java
new file mode 100644
index 0000000000000000000000000000000000000000..ecb87dc0e32a33bf95f33d0e05bb6712cd845c26
index 0000000000000000000000000000000000000000..8e8e959090e6a75386ca59259f5dd0b0be958419
--- /dev/null
+++ b/core/src/mindustryX/mods/claj/dialogs/JoinViaClajDialog.java
@@ -0,0 +1,100 @@
@@ -0,0 +1,108 @@
+package mindustryX.mods.claj.dialogs;
+
+import mindustry.Vars;
+import mindustry.ui.dialogs.BaseDialog;
+import arc.*;
+import arc.scene.ui.*;
+import mindustry.*;
+import mindustry.gen.*;
+import mindustry.ui.*;
+import mindustry.ui.dialogs.*;
+import mindustryX.mods.claj.*;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.io.*;
+import java.util.*;
+
+public class JoinViaClajDialog extends BaseDialog{
+ private String lastLink = "请输入您的claj代码";
Expand All @@ -254,7 +265,11 @@ index 0000000000000000000000000000000000000000..ecb87dc0e32a33bf95f33d0e05bb6712
+ super("通过claj加入游戏");
+ cont.table(table -> {
+ table.add("房间代码：").padRight(5f).left();
+ table.field(lastLink, this::setLink).size(550f, 54f).maxTextLength(100).valid(this::setLink);
+ TextField tf = table.field(lastLink, this::setLink).size(550f, 54f).maxTextLength(100).valid(this::setLink).get();
+ tf.setProgrammaticChangeEvents(true);
+
+ table.defaults().size(48f).padLeft(8f);
+ table.button(Icon.paste, Styles.clearNonei, () -> tf.setText(Core.app.getClipboardText()));
+ }).row();
+
+ cont.label(() -> output).width(550f).left();
Expand Down
0 ...029-C-RenderExt.showPlacementEffect.patch → ...028-C-RenderExt.showPlacementEffect.patch
View file
File renamed without changes.
42 changes: 0 additions & 42 deletions patches/client/0028-C-add-a-paste-button-in-claj-dialog.patch
View file

This file was deleted.

6 changes: 3 additions & 3 deletions patches/client/0030-C-TimeControl.patch → patches/client/0029-C-TimeControl.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ index 226299c7267bf8323cc9973392b853fdb0c073a1..d90d5a98ae523cbc08d9f2911050fb16
@SuppressWarnings("unused")//call before arc.util.Http$HttpRequest.block
diff --git a/core/src/mindustryX/features/TimeControl.java b/core/src/mindustryX/features/TimeControl.java
new file mode 100644
index 0000000000000000000000000000000000000000..83aeb68aaea8fb8d92f7b9b6a3c295943abf30f4
index 0000000000000000000000000000000000000000..f2833ec179764dbb088fb6caa769f32172e863c8
--- /dev/null
+++ b/core/src/mindustryX/features/TimeControl.java
@@ -0,0 +1,85 @@
Expand Down Expand Up @@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..83aeb68aaea8fb8d92f7b9b6a3c29594
+ }
+
+ public static void draw(Table table){
+ table.label(() -> "沙漏：x" + Strings.autoFixed(getGameSpeed(), 2)).width(18f * 6);
+ table.label(() -> "x" + Strings.autoFixed(getGameSpeed(), 2)).width(18f * 3);
+
+ table.button("/2", Styles.cleart, () -> setGameSpeed(gameSpeed * 0.5f)).tooltip("[acid]将时间流速放慢到一半").size(40f, 30f);
+ table.button("×2", Styles.cleart, () -> setGameSpeed(gameSpeed * 2f)).tooltip("[acid]将时间流速加快到两倍").size(40f, 30f);
Expand All @@ -119,6 +119,6 @@ index 0000000000000000000000000000000000000000..83aeb68aaea8fb8d92f7b9b6a3c29594
+ if(!Strings.canParsePositiveInt(s)) return false;
+ int num = Integer.parseInt(s);
+ return 2 <= num && num < 10000;
+ }).tooltip("允许的范围：2~9999").size(90f, 30f);
+ }).tooltip("允许的范围：2~9999").size(80f, 30f);
+ }
+}
0 ...hes/client/0031-BUILD-Kotlin-1.9.20.patch → ...hes/client/0030-BUILD-Kotlin-1.9.20.patch
View file
File renamed without changes.
25 changes: 15 additions & 10 deletions patches/client/0032-API-ui.Format.patch → patches/client/0031-API-ui.Format.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ Date: Sat, 6 Apr 2024 16:01:26 +0800
Subject: [PATCH] API: ui.Format

---
core/src/mindustryX/features/ui/Format.kt | 84 +++++++++++++++++++++++
1 file changed, 84 insertions(+)
core/src/mindustryX/features/ui/Format.kt | 89 +++++++++++++++++++++++
1 file changed, 89 insertions(+)
create mode 100644 core/src/mindustryX/features/ui/Format.kt

diff --git a/core/src/mindustryX/features/ui/Format.kt b/core/src/mindustryX/features/ui/Format.kt
new file mode 100644
index 0000000000000000000000000000000000000000..9fb3a953945406ee9d2ad59e4c7c372e6a22666b
index 0000000000000000000000000000000000000000..31df651b2b738e2a6e9928c4e4de1a05008bb285
--- /dev/null
+++ b/core/src/mindustryX/features/ui/Format.kt
@@ -0,0 +1,84 @@
@@ -0,0 +1,89 @@
+package mindustryX.features.ui
+
+import arc.math.Mathf
+import arc.util.Strings
+import kotlin.math.abs
+
+@Suppress("MemberVisibilityCanBePrivate")
+data class Format(private var decimal: Int = 2) {
+data class Format @JvmOverloads constructor(private var decimal: Int = 2, private var fixDecimals: Boolean = false) {
+ /**以固定的有效位数输出*/
+ fun fixedPrecision(v: Float): String {
+ val exponent = Mathf.floor(Mathf.log(10f, abs(v)))
Expand All @@ -36,6 +36,11 @@ index 0000000000000000000000000000000000000000..9fb3a953945406ee9d2ad59e4c7c372e
+ return "${Strings.fixed(mantissa, decimal)}[gray]E$exponent[]"
+ }
+
+ private fun format0(number: Float): String {
+ if (fixDecimals) return Strings.fixed(number, decimal)
+ return fixedPrecision(number)
+ }
+
+ /** 格式化浮点数，设计特性如下
+ * 1. 支持特殊数值显示
+ * 2. 支持超大超小数显示科学计数法, 支持K,M,B显示
Expand All @@ -48,12 +53,12 @@ index 0000000000000000000000000000000000000000..9fb3a953945406ee9d2ad59e4c7c372e
+
+ val abs = abs(number)
+ return when {
+ abs <= java.lang.Float.MIN_NORMAL -> fixedPrecision(0f)
+ abs <= java.lang.Float.MIN_NORMAL -> format0(0f)
+ abs < Mathf.pow(10f, -decimal.toFloat()) -> scienceFormat(number)
+ abs < 1e3f || abs < Mathf.pow(10f, 1f + decimal) -> fixedPrecision(number) //直接渲染
+ abs < 1e6f -> "${fixedPrecision(number / 1e3f)}[gray]K[]"
+ abs < 1e9f -> "${fixedPrecision(number / 1e6f)}[gray]M[]"
+ abs < 1e12f -> "${fixedPrecision(number / 1e9f)}[gray]B[]"
+ abs < 1e3f || abs < Mathf.pow(10f, 1f + decimal) -> format0(number) //直接渲染
+ abs < 1e6f -> "${format0(number / 1e3f)}[gray]K[]"
+ abs < 1e9f -> "${format0(number / 1e6f)}[gray]M[]"
+ abs < 1e12f -> "${format0(number / 1e9f)}[gray]B[]"
+ else -> scienceFormat(number)
+ }
+ }
Expand Down
Loading

0 comments on commit 33313d9

Please sign in to comment.