Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,055 Commits 4 Branches 180 Tags
6806c09760a5b3a86854b827a95a33a31c04b951
Commit Graph
7718 Commits
Author SHA1 Message Date
Anuken 1170880127 Merge remote-tracking branch 'origin/master' 2020-10-01 13:33:55 -04:00
Anuken 199be4d13d Implicit non-nullability for fields 2020-10-01 13:33:43 -04:00
Anuken 085bc2ee9c campaign progress 2020-10-01 11:19:42 -04:00
老滑稽andGitHub b7b2da6bbd Update bundle_zh_CN.properties 2020-10-01 21:01:30 +08:00
AnukenandGitHub 2604a2d649 Merge pull request #2783 from Quezler/patch-45 
Move cryofluid mixer emoji back to the old number
 2020-10-01 08:56:28 -04:00
VanguardandGitHub 65a0bd9a63 2 lines changed; 1 line added 
Changed:
unit.vela.name
block.foreshadow.name

Added:
block.tsunami.name
 2020-10-01 14:47:56 +03:00
Patrick 'Quezler' MounierandGitHub ce463d225f Clarify stack conveyor recharge property 
(also, should be minimum & multiple of 1)
 2020-10-01 11:54:58 +02:00
Patrick 'Quezler' MounierandGitHub 8e4d00d594 Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Anuken 4264b960cd Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign 2020-09-30 22:46:33 -04:00
Anuken b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
Anuken 54c991e611 Removed outOfTime pause 2020-09-30 22:25:28 -04:00
Leonwang4234 87b21c052f Update SaveFileReader.java 
fix
 2020-09-30 18:29:58 -07:00
Leonwang4234 9601c81045 change sprite name 2020-09-30 18:05:43 -07:00
Leonwang4234 14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken f3c642d0d7 Fixed #2779 2020-09-30 19:55:22 -04:00
Anuken a0394e4382 Balance 2020-09-30 18:56:37 -04:00
Anuken 7eb0da82de Added enemy lights setting 2020-09-30 17:44:13 -04:00
Anuken 326640d32a Cleanup 2020-09-30 17:21:05 -04:00
Anuken 1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04:00
Anuken d07c74b60f Re-added tap event for servers 2020-09-30 15:01:46 -04:00
Anuken 059c729a2c Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-30 14:50:09 -04:00
Anuken 03d676403f Cleanup 2020-09-30 14:50:05 -04:00
slava0135 feb8202b73 better stats... 2020-09-30 21:17:44 +03:00
slava0135 65607ba6bf better stats 2020-09-30 21:13:14 +03:00
slava0135 a806d7c019 Fun fact: 1.0 is smaller than 10 2020-09-30 20:41:56 +03:00
slava0135 aa5b3aa756 balancing 2020-09-30 20:30:04 +03:00
AnukenandGitHub 6645e3a473 Merge pull request #2772 from LeoDog896/pathfinder 
Remove nearGround in favor of !nearLiquid
 2020-09-30 12:59:55 -04:00
LeoDog896 f2fd23dced can be nearGround AND nearLiquid 2020-09-30 12:56:59 -04:00
LeoDog896 49db761730 Revert "remove nearGround in favor of !nearLiquid" 
This reverts commit 8751e77876.
 2020-09-30 12:56:43 -04:00
Anuken d2728c2bf0 Fixed #2774 2020-09-30 12:45:01 -04:00
YellOw139andGitHub 09934d9e12 Foreshadow 2020-09-30 19:15:52 +03:00
slava0135 48da4933fc comma 2020-09-30 18:52:59 +03:00
slava0135 07cdbfa423 New turret sprite by EyeOfDarkness 2020-09-30 18:47:56 +03:00
Anuken 0963de4022 Cleanup 2020-09-30 11:19:38 -04:00
LeoDog896 8751e77876 remove nearGround in favor of !nearLiquid 2020-09-30 11:15:11 -04:00
AnukenandGitHub b38e7f66ad Merge pull request #2770 from LeoDog896/autotiler 
Autotiler docs and cleanup
 2020-09-30 10:49:42 -04:00
AnukenandGitHub ba53d76d8d Merge pull request #2769 from Voz-Duh/packed-liquid-drawer 
Packed Liquid Drawer
 2020-09-30 10:46:45 -04:00
slava0135 58ff3f2ef7 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 2020-09-30 17:18:20 +03:00
LeoDog896 6db2376835 Revert to if-statement 2020-09-30 09:47:03 -04:00
LeoDog896 2b04ebb14d Enum follows camelCase rules 2020-09-30 09:46:33 -04:00
LeoDog896 fbb317aa11 Update contributors 2020-09-30 09:30:12 -04:00
LeoDog896 1c04653ffd Autotiler cleanup and documentation 2020-09-30 09:29:57 -04:00
Voz-Duh 91274ae104 Fix 2020-09-30 16:19:32 +03:00
Voz-Duh adf0f60abb Fix 2020-09-30 16:08:32 +03:00
Voz-Duh 20e56ed3d3 Packed Liquid Drawer 2020-09-30 15:58:11 +03:00
LeoDog896 177aa934b6 Merge remote-tracking branch 'upstream/master' 2020-09-30 08:43:08 -04:00
Felix CorvusandGitHub aeaa5ac6e2 some trick 2020-09-30 15:42:07 +03:00
LeoDog896 a8c6c30382 Remove unused package 2020-09-30 08:41:33 -04:00
Felix CorvusandGitHub 54d4f733ef Update bundle_ru.properties 2020-09-30 14:35:52 +03:00
Felix CorvusandGitHub 75d8f93dd9 Update bundle_ru.properties 2020-09-30 14:07:06 +03:00