Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,765 Commits 4 Branches 180 Tags
4b71b4f80a7920e75fff400d74d509e1aadfbf8d
Commit Graph

6839 Commits

Author SHA1 Message Date
Anuken
834e4f175b Fixed #4122 2020-12-25 15:56:53 -05:00
Anuken
bba52e99e0 Fixed #4121 2020-12-25 12:34:02 -05:00
Anuken
4339042078 Fixed #4120 2020-12-25 10:57:54 -05:00
Anuken
f86291c587 Merge remote-tracking branch 'origin/master' 2020-12-25 01:26:24 -05:00
Anuken
da96b23441 Higher power source output 2020-12-25 01:26:20 -05:00
Sunny Kim
beed2e0b8f Block Forge improvements (#4112) 
* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot
 2020-12-25 00:02:15 -05:00
Anuken
eda6770e11 Fixed mined item flashing on clients 2020-12-24 23:17:35 -05:00
Antsiferov Andrew
43757a247e [QoL] Chat modes (#3869) 
Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).
 2020-12-24 16:05:41 -05:00
Anuken
1e8621d9d4 Merge remote-tracking branch 'origin/master' 2020-12-24 11:43:08 -05:00
Anuken
0940abe98c Fixed #4108 2020-12-24 11:43:04 -05:00
younggam
4a71564d03 mod version check fix (#4100) 
* Update Version.java

* Update contributors
 2020-12-24 10:36:55 -05:00
Patrick 'Quezler' Mounier
9397bd57c4 Prevents plastanium conveyor unload exploit (#4098) 
* Prevent unloaders from unloading plast loading dock

* Use overridable boolean method unloadable instead

* unloadable -> canUnload
 2020-12-24 10:33:40 -05:00
Patrick 'Quezler' Mounier
85a668c202 Prevent visual plastanium conveyor glitch when disabled (#4101) 2020-12-24 09:47:43 -05:00
Anuken
90372171b2 Fixed #4104 2020-12-24 09:44:24 -05:00
Anuken
f5c270347c Version parse fix 2020-12-23 14:37:39 -05:00
Anuken
a21cc32be9 Marked mod browser as WIP 2020-12-23 12:33:56 -05:00
Anuken
79423e4c60 Mod browser initial implementation 2020-12-23 12:21:25 -05:00
Anuken
8ac027af70 More browser cleanup 2020-12-23 12:03:43 -05:00
Anuken
b6f1b67b24 Merge branch 'master' into ThePythonGuy3-patch-1 2020-12-23 10:51:56 -05:00
Anuken
715d94967e Cleanup 2020-12-23 10:51:24 -05:00
MEEP of Faith
a21f79ac6a Draw size independent from puddle size. (#3826) 
* Draw size independent from puddle size.

* Apply change to Bullets
 2020-12-23 10:29:26 -05:00
Sunny Kim
986caa857e public SettingsTables for mod settings (#4085) 2020-12-23 09:41:43 -05:00
Sunny Kim
1a14860b62 bump editor only blocks foward (#4084) 2020-12-23 09:40:00 -05:00
Patrick 'Quezler' Mounier
d144e9c91c Allow plastanium conveyor to be unloaded (#4087) 2020-12-23 09:39:29 -05:00
Patrick 'Quezler' Mounier
9d740e1e37 Rebrand power infinite as power source (#4088) 2020-12-23 09:39:04 -05:00
Anuken
71488313e1 Fixed #4082 2020-12-22 20:13:34 -05:00
Anuken
a44f3c379f Ammo/shot display 2020-12-22 15:10:48 -05:00
Anuken
f3d5cb315e Cleanup 2020-12-22 13:51:11 -05:00
Anuken
d3f99105b2 Merge remote-tracking branch 'origin/master' 2020-12-22 13:42:01 -05:00
Anuken
7f49f0c6fa Fixed #4079 2020-12-22 13:41:54 -05:00
Anuken
ceb298ca0b cleanup 2020-12-22 12:52:01 -05:00
Sunny Kim
79d4925761 THIS WAS WHAT IT WAS ALL ALONG (#4069) 2020-12-22 11:30:09 -05:00
Anuken
7ea12e97ec Fixed #4073 2020-12-22 11:28:33 -05:00
Anuken
17177f87aa Fixed #4071 2020-12-22 11:20:35 -05:00
Anuken
24c71e49c7 cleanup 2020-12-22 10:48:11 -05:00
Anuken
eda134a18c Merge remote-tracking branch 'origin/master' 2020-12-21 20:48:07 -05:00
Anuken
852013cd63 #4068 2020-12-21 20:48:00 -05:00
Sunny Kim
5b163d7843 Heat for accelerator (#4065) 
* heat

* better animations
 2020-12-21 20:04:04 -05:00
Anuken
806cea4b33 Added building damage to bullet stats 2020-12-21 16:55:04 -05:00
Anuken
952639a72e Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-21 13:10:00 -05:00
Anuken
e4e428f84a Fixed #4064 2020-12-21 13:09:08 -05:00
Patrick 'Quezler' Mounier
9a577adf5f Makes Drill.drawMineItem default to true (#4057) 
* Update Blocks.java

* Update Drill.java
 2020-12-20 15:22:34 -05:00
Anuken
e3c68b485d Placement rendering cleanup 2020-12-20 14:28:14 -05:00
Anuken
75a4d2901f Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-20 14:22:27 -05:00
Patrick 'Quezler' Mounier
bbdcef62e4 Draw item in the drill center when in place mode (#4055) 
* Draw item in the drill center when in place mode

* Update core/src/mindustry/world/blocks/production/Drill.java

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-12-20 14:22:14 -05:00
Patrick 'Quezler' Mounier
118ae8e87d #3889 2: electric boogaloo (#4056) 2020-12-20 14:22:01 -05:00
Anuken
40a6a9e1c7 Comment cleanup 2020-12-20 12:04:36 -05:00
Patrick 'Quezler' Mounier
22221a0f28 Add in region to payload block icons (#4052) 2020-12-20 09:58:18 -05:00
Anuken
c39f4c1b7d Fixed #4051 2020-12-20 09:50:29 -05:00
Anuken
4f683cac8b Fixed #4054 2020-12-20 09:47:45 -05:00