mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,535 Commits 4 Branches 160 Tags 2.1 GiB
2109a25e3e
Commit Graph

14535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
2109a25e3e Turret progress 2022-06-16 15:34:22 -04:00
Anuken
52b5ed57bf Unfinished/WIP turret 2022-06-16 13:46:20 -04:00
Anuken
9807974de3 Merge remote-tracking branch 'origin/master' 2022-06-16 11:22:10 -04:00
Anuken
7cc064d14f Fixed black conduit regions 2022-06-16 11:22:05 -04:00
ErrorInCode
2db1429644
fix missing StatUnit (#7027) 2022-06-16 09:26:54 -04:00
Lucky Clover
19e213f19b
make UnitAssembler affected by rules.unitBuildSpeed (#7023) 2022-06-15 10:25:10 -04:00
Anuken
fbadda40f6 Merge remote-tracking branch 'origin/master' 2022-06-15 08:10:10 -04:00
Anuken
43cac0bd1e Fixed #7022 2022-06-15 08:10:06 -04:00
MEEPofFaith
4fca366fcd
Make OverdriveBuild fields public (#7018) 2022-06-15 07:35:44 -04:00
Goobrr
e8aa787f1f
Unit plan UI (#7021) 2022-06-15 07:35:34 -04:00
MEEPofFaith
d3f2fffa03
non-suppressable blocks shouldn't be heal suppressed (#7019) 2022-06-15 07:34:58 -04:00
Anuken
bdb199c5e7 Merge remote-tracking branch 'origin/master' 2022-06-15 07:29:36 -04:00
Anuken
3cacff6550 Fixed #7020 2022-06-15 07:29:32 -04:00
xem8k5
d3e5a139e3
Update bundle_zh_CN.properties (#7017) 2022-06-14 22:40:22 -04:00
Anuken
caed77bac2 Crash fix 2022-06-14 11:26:22 -04:00
Anuken
122c7654e5 Possible fix for double turret outline 2022-06-14 11:22:45 -04:00
Anuken
1af75baa41 Merge remote-tracking branch 'origin/master' 2022-06-14 10:55:01 -04:00
Anuken
697df9d9f1 Double outline check 2022-06-14 10:54:56 -04:00
Somka000
33cd7c0bf4
Update (#7004) 2022-06-14 10:26:31 -04:00
First Creator
c1317a787d
(update bundle_fil.properties) when will anuken merge this lol (#6992) 
* we goin perhaps

UwU~

* more i guess

* Update bundle_fil.properties
 2022-06-14 08:27:52 -04:00
Github Actions
472da6f1b5 Automatic bundle update 2022-06-14 12:20:04 +00:00
Tegas Aziz
1469b96db7
[ID] Bundle updates (#7015) 
* [ID[ Bundle updates

* unicode on initerror
 2022-06-14 08:18:42 -04:00
Anuken
ce27388fad Misc bugfixes 2022-06-13 23:23:45 -04:00
Anuken
f5b38ccbba Merge remote-tracking branch 'origin/master' 2022-06-13 21:42:16 -04:00
Anuken
2134762ed1 More world processor privileges 2022-06-13 21:42:10 -04:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Ilya246
dc5b184d45
Add a solar panel output multiplier (#7013) 
* do

* world processor compatibility

* useless
 2022-06-13 21:09:06 -04:00
Ilya246
58bfd0e46c
add thing (#7012) 2022-06-13 20:49:13 -04:00
Anuken
1be8f11ec8 Merge remote-tracking branch 'origin/master' 2022-06-13 20:48:15 -04:00
Anuken
7b1d36a40a Fixed #7011 2022-06-13 20:48:10 -04:00
Ilya246
0d6303c841
bugfix (#7010) 2022-06-13 08:30:53 -04:00
Anuken
3c26ad3ec7 Duct router save loading bugfix 2022-06-13 00:18:58 -04:00
Anuken
b87a3ebd88 Merge remote-tracking branch 'origin/master' 2022-06-12 23:04:32 -04:00
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