Anuken
051a41e86d
String overload for mod options
2022-05-09 22:35:58 -04:00
Anuken
83d15ce65e
Merge remote-tracking branch 'origin/erekir' into erekir
2022-05-09 20:51:31 -04:00
Anuken
2162770e57
Custom settings categories
2022-05-09 20:51:27 -04:00
xem8k5
db947d33ca
Update bundle_zh_CN.properties twice ( #6802 )
...
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
2022-05-09 20:06:23 -04:00
Anuken
aa1abeb4be
Typo fixes
2022-05-09 19:55:51 -04:00
Anuken
2b46bbfd2c
Merge remote-tracking branch 'origin/erekir' into erekir
2022-05-09 18:24:31 -04:00
Anuken
76f1cfbc07
Actually fixed Serpulo base gen
2022-05-09 18:24:27 -04:00
Github Actions
1a07b1514f
Automatic bundle update
2022-05-09 21:42:41 +00:00
Anuken
31c5ef2dc5
Some world processor documentation
2022-05-09 17:41:42 -04:00
Anuken
cf1fb98d5c
Misc bugfixes
2022-05-09 17:33:43 -04:00
dead inside
8269d79e56
Liquid Output Display ( #6788 )
...
* Liquid Output Display
* hshfhqwehpvoipwjovpwiqffjvpwqenoij0n89f4v123f2v40q9j8hbnwqvceinopjj90cmqwvinv21904uinfhu0bnv9j90h84g bvb8024q3bh80b3498vcfj932ndjqdjponjewopnviqvnifjwp9ghpnewuubgqjiojpdfoekwdckmpqwpkmidpkewpjndqvjwnfnj8132nt345879ytgh342890yu4598yhubn4t9hrj[tevpkofkwemfvewrphojfekpcfoerkfwmvfh23bng0398g9834ifvrfnwurbgiwnwgherhnwenhgpvrnnivjpjnipfqwjniwqfejnipofvniwejpfqjwociomjefjjmvcmj21m4f98v00ngbhegwefgpjroiewjfqfwpiojnmem
* Pull to separate function
The javadoc description could be different
* In case mods have liquid icons larger than 32x32
2022-05-09 17:06:55 -04:00
Anuken
94db45f148
Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir
2022-05-09 16:55:10 -04:00
Anuken
6cc30e6ebd
Fixed tank tread rects
2022-05-09 16:55:08 -04:00
dead inside
2e71c3cf8a
"speed" -> "alpha" ( #6801 )
2022-05-09 16:52:36 -04:00
Anuken
a82a6f4324
Manual trimming of sprites
2022-05-09 15:14:09 -04:00
Anuken
03a3e43b01
Merge remote-tracking branch 'origin/erekir' into erekir
2022-05-09 15:01:53 -04:00
Anuken
f9be361846
Cropped sprite packing
2022-05-09 15:01:49 -04:00
Epowerj
6e23fffe41
More level 2 tweaks to make it easier
2022-05-09 13:28:27 -04:00
Epowerj
5c6b8df764
Merge remote-tracking branch 'origin/erekir' into erekir
2022-05-09 12:54:28 -04:00
Anuken
0b141b6eb0
more misc bugfixes
2022-05-09 12:51:05 -04:00
Epowerj
1668035759
Tweaked clipping issues in onset
2022-05-09 12:45:48 -04:00
Anuken
4635aad335
Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir
2022-05-09 12:21:23 -04:00
Anuken
41413d65b7
Do not allow cross-planet launch pads
2022-05-09 12:21:21 -04:00
Epowerj
79240a45d0
More tweaks to level two - show players they can water cool breach turret
2022-05-09 11:46:11 -04:00
Anuken
f2e5efaea7
Merge remote-tracking branch 'origin/erekir' into erekir
2022-05-09 11:45:05 -04:00
Anuken
3bbb00db9a
bugfixes
2022-05-09 11:45:01 -04:00
Epowerj
c5cafd5573
Adjustments to level two to make it easier
2022-05-09 11:39:16 -04:00
Anuken
900e3ec334
bugfixes
2022-05-09 09:49:15 -04:00
Anuken
a8a8cc950e
ok ilya
2022-05-09 04:51:44 -04:00
Anuken
846aa3a5ab
world processors accessible in playtest
2022-05-09 04:42:42 -04:00
Anuken
a1ac74950c
notify spam fix
2022-05-09 04:33:13 -04:00
Anuken
eb52c6d61f
Status apply instruction / Bugfixes
2022-05-09 04:10:18 -04:00
Anuken
aace191116
Crash fix
2022-05-09 03:06:25 -04:00
Anuken
d8ceb03b3c
Fixed tests
2022-05-08 23:58:36 -04:00
Anuken
1728b58290
Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir
2022-05-08 23:53:28 -04:00
Anuken
4333f12fd8
More turret consistency / Power curve for recoil
2022-05-08 23:53:25 -04:00
Goobrr
39941799d9
correct label position ( #6793 )
2022-05-08 23:50:14 -04:00
Anuken
9697036599
Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir
2022-05-08 23:17:40 -04:00
Anuken
5a3c8573c3
WIP Turret field rename / More JSON consume support
2022-05-08 23:17:37 -04:00
xem8k5
f16119cd0f
Update bundle_zh_CN.properties ( #6759 )
...
* Translation zh_cn partly
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
发觉强化不符合题意，普通容器血量220 容量300，“强化”容器血量480 容量250，反向强化是不是？故固化符合题意
2022-05-08 21:28:20 -04:00
buthed010203
efee6b9713
Minor blockrenderer cleanup ( #6791 )
2022-05-08 20:18:02 -04:00
Anuken
668b09e955
Misc bugfixes
2022-05-08 17:07:06 -04:00
Anuken
a7ecdf8aab
crash fix?
2022-05-08 13:57:52 -04:00
Anuken
78b74d01cb
a
2022-05-08 13:54:48 -04:00
Anuken
1733381cf2
Bugfixes
2022-05-08 13:52:43 -04:00
Anuken
5492c52249
Crash fix
2022-05-08 13:20:52 -04:00
Anuken
12c33cc032
Merge branch 'erekir' of https://github.com/Anuken/Mindustry into erekir
2022-05-08 12:54:38 -04:00
Anuken
02bbc10f40
Bugfixes
2022-05-08 12:54:36 -04:00
Github Actions
e69aa6bf49
Automatic bundle update
2022-05-08 16:46:41 +00:00
Anuken
d28a839f55
RTS unit control improvements/fixes
2022-05-08 12:45:48 -04:00
