mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,702 Commits 4 Branches 160 Tags 2.3 GiB
5ea8538e0f
Commit Graph

14702 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
0dface7cc1 Misc preparations for unified packing 2022-06-12 23:04:26 -04:00
router
1e536622a2
format infinities (#7009) 
* format infinities

* 🤨
 2022-06-12 22:47:08 -04:00
Anuken
1a63a2726e well, that didn't work. 2022-06-12 13:22:54 -04:00
Anuken
8267376d32 Experimental test for atlas OOM 2022-06-12 13:11:20 -04:00
Anuken
4519ba8bf6 Merge remote-tracking branch 'origin/master' 2022-06-12 09:22:11 -04:00
Anuken
8f4a5c3572 Some minor IO null checks 2022-06-12 09:22:06 -04:00
Valeriy
023f584ee7
Address update (#7006) 
* Update servers_v6.json

* Update servers_v7.json

* дублёр на в6

* дублёр на в7
 2022-06-12 09:12:34 -04:00
Anuken
7ac2645a63 let's see if this changes anything 2022-06-11 14:02:21 -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
Valeriy
d18b787ebb
Cum back to v6 (#7003) 2022-06-11 08:17:29 -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
SachaTending
758d9ee795
Add another host of tendhost (#6971) 2022-06-09 22:23:46 -04:00
Sam Bloom
3e89b07beb
Update servers_v6.json (#7000) 
* yes, another change

* Update servers_v7.json

* Update servers_v6.json
 2022-06-09 22:23:32 -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
f8f693cd9d Merge remote-tracking branch 'origin/master' 2022-06-09 09:52:50 -04:00
Anuken
dc6617cfad Threads update 2022-06-09 09:52:44 -04:00
Phinner
e9ca6dc705
Update Xpdustry servers (#6904) 
* node-ify xpdustry servers

* new server

* let's move that too
 2022-06-09 08:47:29 -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
RTOmega
c70d83ab90
OmegaHub BE Server (#6994) 2022-06-08 13:35:45 -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
Atanner
edf71e30c9
Update servers_v6.json (#6881) 
We're Back ;) Thanks Anuke for making such a cool game!
 2022-06-08 11:21:07 -04:00
Github Actions
a18af7de64 Automatic bundle update 2022-06-08 15:20:55 +00:00
KotMilkMeoWtwo
177cd63320
meowland comeback (#6962) 
https://github.com/KotMilkMeoWtwo/MeowLandPlugin
Nya
 2022-06-08 11:20:03 -04:00
squi2rel
1565b75ce9
Update servers_be.json (#6914) 2022-06-08 11:19:31 -04:00
KayAyeAre
4646db8194
thai translation for v7 (#6927) 
* translations part 1

* translations part 2
 2022-06-08 11:18:49 -04:00
Alexander397172YT
5c117e24d2
new createdustry IP (#6938) 2022-06-08 11:18:37 -04:00
RTOmega
122abc40b4
OmegaHub Port Change (#6986) 
* OmegaHub Port Change

* Update servers_v6.json
 2022-06-08 11:17:24 -04:00
Ilya246
1a2a851322
update pl server address, put into server category (#6991) 
* update pl server address, put into server category

do not merge until somka and router comment

* Create servers_be.json
 2022-06-08 11:17:16 -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
Anuken
a3f02ad5a8 Merge remote-tracking branch 'origin/master' 2022-06-08 10:39:12 -04:00
Anuken
389cace4c7 Fixed #6897 2022-06-08 10:39:09 -04:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00