Epowerj
f728bd643a
Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2
2022-08-04 19:02:22 -04:00
Epowerj
1fa34518d6
Progress on marsh
2022-08-04 19:02:11 -04:00
Anuken
62d0d62d22
Fixed squished pump liquid icon
2022-08-04 18:45:51 -04:00
Epowerj
1245ff006f
Progress on marsh
2022-08-04 18:45:26 -04:00
Anuken
f9c73c2fdc
Merge remote-tracking branch 'origin/master'
2022-08-04 18:43:42 -04:00
Anuken
bf926d139d
Fixed akrycite output
2022-08-04 18:43:38 -04:00
Epowerj
f6b5962997
Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2
...
Conflicts:
core/src/mindustry/content/Blocks.java
2022-08-04 14:55:14 -04:00
Epowerj
e3566bda28
Progress on marsh
2022-08-04 14:32:05 -04:00
Nunting
a13c8f5c4a
Update bundle_ko.properties ( #7285 )
2022-08-04 14:06:47 -04:00
Epowerj
d9312bc960
Progress on marsh
2022-08-04 13:51:41 -04:00
Anuken
1bb45fe91c
Minor bugfixes/cleanup
2022-08-04 13:49:22 -04:00
Anuken
46f8838d1a
Fixed #7284
2022-08-04 10:23:49 -04:00
Anuken
1d8166669b
Fixed #7283
2022-08-04 10:14:13 -04:00
Anuken
db8e7675c8
Merge remote-tracking branch 'origin/master'
2022-08-03 23:44:10 -04:00
Anuken
243a672a5b
Disabled NetworkIO entity writing
2022-08-03 23:44:07 -04:00
Epowerj
d6a0ce0fce
Progress on marsh
2022-08-03 21:09:37 -04:00
Nunting
45f8712fe8
Update bundle_ko.properties ( #7262 )
2022-08-03 19:36:06 -04:00
MEEPofFaith
ff28daa3a4
FlakDelay ( #7281 )
2022-08-03 17:08:53 -04:00
Epowerj
8a51ac0bdc
More work on marsh
2022-08-03 16:33:21 -04:00
Epowerj
00d6a73c27
Tweaked tech tree and for marsh
2022-08-03 16:33:14 -04:00
Anuken
3138f05cc2
Merge remote-tracking branch 'origin/master'
2022-08-03 16:09:10 -04:00
Anuken
58246747ee
Fixed shielded wall being available on Serpulo
2022-08-03 16:09:05 -04:00
SoMall-dumpling
c8257871b9
Update bundle_zh_CN.properties ( #7261 )
...
* Update bundle_zh_CN.properties
The Ultimate Unit Control System Translation
* Update bundle_zh_CN.properties
The Ultimate Flux Reactor
* Update bundle_zh_CN.properties
删除一个多余的空行
* Update bundle_zh_CN.properties
语序调整
2022-08-03 08:32:20 -04:00
Github Actions
65db43268c
Automatic bundle update
2022-08-03 01:27:29 +00:00
Anuken
a54907583b
Neoplasia reactor
2022-08-02 21:26:15 -04:00
Epowerj
e2dea0f84e
Begin rework of basin
2022-08-02 18:32:26 -04:00
Epowerj
d77afbea06
Being work on marsh
2022-08-02 18:17:53 -04:00
Anuken
e28d7b8d8d
Generator explosion system cleanup
2022-08-02 13:13:37 -04:00
Anuken
fa1a5971cf
Merge remote-tracking branch 'origin/master'
2022-08-01 20:56:41 -04:00
Anuken
9a95754007
Fixed incorrect scaling with command layout
2022-08-01 20:56:37 -04:00
Github Actions
efb258e9a6
Automatic bundle update
2022-08-02 00:29:14 +00:00
Anuken
2bc000f53c
WIP flux reactor
2022-08-01 20:28:07 -04:00
Anuken
36ecb45fb4
Minor UI style tweaks
2022-07-31 13:59:31 -04:00
Anuken
3d0a1868c6
Merge remote-tracking branch 'origin/master'
2022-07-31 11:43:26 -04:00
Anuken
427100c61d
Fixed commanded unit UI refresh
2022-07-31 11:43:23 -04:00
Joan Josep
d029c85ec5
Add Catalan to available languages and start its localisation. ( #7076 )
...
* Add Catalan to available languages and start its localisation.
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update Catalan.properties
* Update Catalan.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundle_ca.properties
* Update bundles_ca.properties
* Update bundles_ca.properties
* Update bundle_ca.properties
Co-authored-by: Anuken <arnukren@gmail.com >
2022-07-31 10:57:00 -04:00
Anuken
765684a9b0
Fixed #7263
2022-07-31 10:55:33 -04:00
Anuken
83ccd0cf48
Merge remote-tracking branch 'origin/master'
2022-07-31 10:38:00 -04:00
Anuken
1fe988adc2
Fixed unit movement overshoot
2022-07-31 10:37:55 -04:00
Nunting
9c276f362d
Update bundle_ko.properties ( #7253 )
...
* Update bundle_ko.properties
* Update bundle_ko.properties
2022-07-31 00:50:26 -04:00
Anuken
3d64047a91
Fixed Quad Repair AI
2022-07-31 00:30:37 -04:00
Anuken
ce0a8de25b
Fixed certain units having useless mine command
2022-07-31 00:16:30 -04:00
Anuken
a87aa75adb
More misc cleanup
2022-07-30 23:06:59 -04:00
Anuken
7df2a7ad43
Fixed #7260
2022-07-30 23:03:54 -04:00
Anuken
a0c4ed11c6
Merge remote-tracking branch 'origin/master'
2022-07-30 21:59:40 -04:00
Anuken
0debdee40b
Fixed more wide water / Unit command JSON support
2022-07-30 21:59:36 -04:00
Github Actions
cf9a7f0c63
Automatic bundle update
2022-07-31 01:03:28 +00:00
Anuken
55edd53f84
WIP command order system
2022-07-30 21:01:07 -04:00
Anuken
a326e36bbe
Merge remote-tracking branch 'origin/master'
2022-07-30 10:05:06 -04:00
Anuken
b9753204da
Fixed #7256
2022-07-30 10:05:01 -04:00
