Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,499 Commits 4 Branches 180 Tags
8267376d32ad4de090f2970c1a9c6578e45db87c
Commit Graph

12235 Commits

Author SHA1 Message Date
Anuken
8267376d32 Experimental test for atlas OOM 2022-06-12 13:11:20 -04:00
Anuken
8f4a5c3572 Some minor IO null checks 2022-06-12 09:22:06 -04:00
Anuken
42d7ca9e0d Merge remote-tracking branch 'origin/master' 2022-06-11 11:20:20 -04:00
Anuken
523f94db98 liquid type support? 2022-06-11 11:20:15 -04:00
xem8k5
2c197aae7c Update bundle_zh_CN.properties again (#7001) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-11 08:17:10 -04:00
Anuken
4c8471c4a7 Fixed #7002 2022-06-10 17:31:27 -04:00
Anuken
8d27d70bc2 Merge remote-tracking branch 'origin/master' 2022-06-10 08:34:43 -04:00
Anuken
8418a00483 Misc bugfixes 2022-06-10 08:34:38 -04:00
Github Actions
0a96aedc22 Automatic bundle update 2022-06-09 18:34:03 +00:00
Jerzozwierz
e9bf756165 Update pl (#6853) 
Some changes in translation so it sounds better, also few things translated

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:33:07 -04:00
Github Actions
856a4dd218 Automatic bundle update 2022-06-09 18:31:39 +00:00
彭瑞暄
a618782345 Update zh-TW bundle translations (#6877) 
* formatting and minor changes

* Corrections

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

Clean-up logic-op translations

Co-authored-by: Simba-Fs 陳宏彰 <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:30:43 -04:00
Thomas Widyantoko
fb6e44d9e4 another v7 id_ID bundle update (#6837) 
* another v7 id_ID bundle update

Untranslated strings at line 1744-1754 and 2000-2003. Ambiguous strings at line 1170 and 1638. Fixed several typos, capitalizations and word choices.

* more id_ID v7 translation

untranslated strings at line 1744-1754
line 1942, Grafitik -> Grafit
line 1995-1997 erekir cores
 2022-06-09 14:30:03 -04:00
Anuken
4c5850ae96 Merge remote-tracking branch 'origin/master' 2022-06-09 13:16:39 -04:00
Anuken
1b5e49bd3c Items/liquids consume shorthand 2022-06-09 13:16:34 -04:00
JniTrRny
b199379e1d 4x4 map grid (#6929) 2022-06-09 12:38:19 -04:00
Anuken
dc6617cfad Threads update 2022-06-09 09:52:44 -04:00
Anuken
1920e4399b Possible crash fix 2022-06-08 16:27:47 -04:00
Anuken
c56666b104 Removed inaccessible planets from generate dialog 2022-06-08 16:07:44 -04:00
Anuken
5bf3155272 Fixed #6996 2022-06-08 15:47:04 -04:00
Anuken
67f6ca3d5d Merge remote-tracking branch 'origin/master' 2022-06-08 12:41:23 -04:00
Anuken
9ed5491d6a More payload router fixes 2022-06-08 12:41:20 -04:00
Rex
104e65a868 Update contributors (#6856) 
At a request
 2022-06-08 11:38:23 -04:00
MEEPofFaith
512d4232dd getCategories() (#6905) 
~~There is no reason to ask why I need this.~~
 2022-06-08 11:23:19 -04:00
Github Actions
a18af7de64 Automatic bundle update 2022-06-08 15:20:55 +00:00
KayAyeAre
4646db8194 thai translation for v7 (#6927) 
* translations part 1

* translations part 2
 2022-06-08 11:18:49 -04:00
Anuken
c1549c78f0 Fixed #6883 2022-06-08 11:12:59 -04:00
Anuken
b0c4486b7c Fixed #6874 2022-06-08 11:01:28 -04:00
Anuken
ab90270917 Fixed #6980 2022-06-08 10:50:14 -04:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Anuken
13ac6e0331 Made console a setting 2022-06-08 10:35:00 -04:00
Anuken
62c2d9d606 Fixed #6941 2022-06-08 10:12:53 -04:00
Anuken
0bcaa002ea Fixed #6952 2022-06-08 10:08:59 -04:00
Anuken
a4c0441961 Fixed #6864 2022-06-08 10:07:12 -04:00
Anuken
966a93ddfa Fixed #6930 (probably) 2022-06-08 10:00:32 -04:00
Anuken
abb0078be3 Fixed #6993 2022-06-08 09:57:40 -04:00
Anuken
1f4b0e7f5c Fixed #6917 2022-06-08 09:44:38 -04:00
Anuken
c969749163 Fixed #6898 2022-06-08 09:43:42 -04:00
Anuken
df082c39a3 Fixed #6865 / Fixed headless canvas crash 2022-06-08 09:36:08 -04:00
Anuken
6989a81e03 Fixed #6984 2022-06-08 09:30:30 -04:00
Anuken
eb6c0ebfb5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:27:25 -04:00
Anuken
28150d8f51 Fixed #6985 2022-06-08 09:27:20 -04:00
SoMall-dumpling
8bf2ffc3fc tank. (#6860) 
* .

.

* actually

tank

* another.

.................................
 2022-06-08 09:22:46 -04:00
xem8k5
f8de42d111 Update contributors (#6866) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:22:35 -04:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
BlueWolf
38b0a664f4 so i made a slag heater (#6925) 
* Add slag fueled heater

* i have no idea why i have to do this but i do

Co-authored-by: Blue <415bluewolf@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:20:35 -04:00
MEEPofFaith
5cc314672f canWithdraw() + changes to displayable() (#6902) 
* `shouldDiplay()` + `canWithdraw()`

* Better implementation of `displayable()`
 2022-06-08 09:17:30 -04:00
MEEPofFaith
968651d9ed Charge Progress (#6947) 2022-06-08 09:13:11 -04:00
Anuken
4a6600b94d Merge remote-tracking branch 'origin/master' 2022-06-08 09:11:04 -04:00
Anuken
cbfb621179 Better implementation of #6959 2022-06-08 09:11:00 -04:00