mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,006 Commits 4 Branches 160 Tags 2.3 GiB
51301a50cc
Commit Graph

13006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken
a1107eae13 WIP heat reactor system 2021-11-11 18:52:51 -05:00
Anuken
f3b2e4498d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-11-10 14:36:45 -05:00
Rex
bb443e359f
Update servers_v6.json (#6322) 
* Update servers_v6.json

* Update servers_v6.json

* Update servers_v6.json
 2021-11-10 13:37:38 -05:00
Anuken
c87bc11ad2 Core: Acropolis 2021-11-10 09:38:18 -05:00
Anuken
da87726176 Core: Citadel 2021-11-09 20:20:44 -05:00
MrDuck557
1c4e6b77b4
DestroyBullet (#6311) 
* DestroyBullet

* one space

* review

Co-authored-by: Lele567 <48808663+Lele567@users.noreply.github.com>
 2021-11-09 18:10:28 -05:00
Anuken
501a65e9a3 reorganization 2021-11-09 12:57:14 -05:00
Anuken
34e74834fd Arc furnace recipe fix 2021-11-09 12:49:25 -05:00
LawrenceLin2333
68f8668162
Fix the memory leak when light rendering is disabled (#6321) 2021-11-09 11:10:18 -05:00
Anuken
73f3fe31da Aegis core 2021-11-09 10:41:42 -05:00
Anuken
1f98383535 EEEEEEEEEEEEEENERGYYYYYYYYYY 2021-11-08 22:21:04 -05:00
Matthew Peng
51730556a5
Batteries can be overdrived. (#6320) 2021-11-08 21:43:00 -05:00
Goobrr
c2b5e4b82b
Show internal names (#6317) 
* internal names

* enableConsole

* how did this get left out
 2021-11-08 19:25:17 -05:00
JrTRinny
c96b723aaa
more delectable selection pane (#6318) 2021-11-08 18:12:23 -05:00
Anuken
5f3b3ea559 H 2021-11-08 16:11:55 -05:00
Anuken
8964caf2aa Conduit bridge fixes 2021-11-08 16:09:43 -05:00
Anuken
dffe90acff Directional liquid bridge 2021-11-08 12:06:55 -05:00
Anuken
ce0e26f008 New liquid tanks/routers/contaienrs 2021-11-08 09:47:00 -05:00
Anuken
af7c11c4b7 Merge remote-tracking branch 'origin/master' 2021-11-08 08:56:32 -05:00
Anuken
656bb34b68 Fixed #6314 2021-11-08 08:56:26 -05:00
Anuken
d72de24942 WIP liquid blocks 2021-11-08 08:56:12 -05:00
Matthew Peng
1dd0f67daf
recoil = recoilAmount twice (#6312) 2021-11-07 22:33:11 -05:00
Anuken
07d9feeb09 WIP reinforced conduits 2021-11-07 12:56:58 -05:00
Anuken
09a934385e "stuff" 2021-11-06 22:21:46 -04:00
Matthew Peng
fff7283568
Pointless if (#6310) 2021-11-06 21:12:38 -04:00
Anuken
da49328412 Stack router + Consistent item source + Item void flow 2021-11-06 16:31:42 -04:00
OSP
b88ddef3c5
XCore hosting is now exists. (#6308) 2021-11-06 11:56:30 -04:00
Anuken
ed302d978c sprites 2021-11-05 19:50:47 -04:00
Anuken
059dc4b3bc Directional duct unloader 2021-11-05 19:45:27 -04:00
Anuken
52a88e7301 removed unused sprites 2021-11-05 16:41:27 -04:00
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Valeriy
93c6fa64f7
Unsuccesful updating (#6302) 
I have unsuccesful update to 134.1, because i need a create ALL maps from 0.
 2021-11-05 09:42:10 -04:00
Anuken
24ca434bae Take into account string length in client snapshots 2021-11-05 08:51:59 -04:00
Anuken
57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken
189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken
5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken
b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken
5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Anuken
9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00
Anuken
c43ca32b7d cleanup 2021-11-04 19:33:38 -04:00
Anuken
3a70a26b93 Fixed 'spark' name conflict 2021-11-04 16:20:39 -04:00
Anuken
0effae1cd7 sprites 2021-11-04 15:42:25 -04:00
Anuken
240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken
1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Matthew Peng
7884bbd299
stack conveyor looks weird on payload conveyors (#6295) 2021-11-03 13:37:02 -04:00
Matthew Peng
996193ea69
payloadRotation field (#6294) 2021-11-03 13:34:42 -04:00
Matthew Peng
3574b982ab
misspelling (#6291) 2021-11-02 22:03:47 -04:00
Matthew Peng
a438be7fcd
when and why was this hardcoded (#6289) 2021-11-02 20:22:07 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00