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
9,274 Commits 4 Branches 160 Tags 2.3 GiB
7d0952d858
Commit Graph

9274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
summetdev
d3e26c7c16 Admin chat command 2020-10-20 13:33:28 +03:00
Thomas Widyantoko
0ba653ddd0
Merge branch 'master' into patch-2 2020-10-20 05:55:02 +07:00
Anuken
c27251cfb0 Fog 2020-10-19 18:28:37 -04:00
Anuken
d5fb0e924a Merge remote-tracking branch 'origin/master' 2020-10-19 16:26:03 -04:00
Anuken
6e8732387b Better weather classes 2020-10-19 16:25:59 -04:00
Anuken
ef0376371d
Merge pull request #3030 from sk7725/patch-21 
remove final from item.color (and liquid too)
 2020-10-19 12:20:14 -04:00
Sunny Kim
3c2e12621e
rainbow liquid 2020-10-20 01:01:45 +09:00
Sunny Kim
efb42296cf
remove final 2020-10-20 00:57:08 +09:00
Anuken
cab08de1f7 Merge remote-tracking branch 'origin/master' 2020-10-19 11:34:59 -04:00
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Anuken
073b82b70f
Merge pull request #3029 from abomb4/patch-mod-environment 
Json in Mod should be able to define OreBlock type
 2020-10-19 10:43:53 -04:00
abomb4
9e79ed8a26
Json in Mod should be able to define OreBlock type 
That in mindustry.world.blocks.environment package
 2020-10-19 22:34:52 +08:00
Anuken
59e1fd1eb6 typo 2020-10-19 10:04:30 -04:00
Anuken
d1d674cfc9 Merge remote-tracking branch 'origin/master' 2020-10-19 10:04:13 -04:00
Anuken
80f801db36 Fixed #3023 / Fixed #3020 2020-10-19 10:04:10 -04:00
Anuken
400d36609a
Merge pull request #3022 from Ilya246/patch-1 
armor defined twice in mega
 2020-10-19 09:41:06 -04:00
GlennFolker
cae66a1e6d
allow mods to easily load icon region 2020-10-19 19:13:06 +07:00
Thomas Widyantoko
e88a2f8437
Space block name changed 2020-10-19 14:50:56 +07:00
Thomas Widyantoko
4b4cde288b
Update bundle_in_ID.properties 
Improved translation, new lines and a slight text color format fix.
 2020-10-19 13:43:59 +07:00
Ilya246
ad5d3581f6
armor defined twice in mega 2020-10-19 10:09:39 +04:00
Petr Gašparík
538c198113 Czecg translation up to commit 46ec457 2020-10-19 07:48:57 +02:00
Petr Gašparík
8f4ac642d1 Merge branch 'master' of https://github.com/Anuken/Mindustry into v107 2020-10-19 07:34:10 +02:00
Anuken
7f21d61078 Crash fix 2020-10-18 19:54:52 -04:00
Anuken
c7622198fd Cleanup 2020-10-18 19:21:59 -04:00
Anuken
3a52fb2afe Merge branch 'router' 2020-10-18 19:03:13 -04:00
Anuken
e63bbe6ac9 Merge remote-tracking branch 'origin/master' 2020-10-18 18:34:24 -04:00
Anuken
dac236b0e9 Better launch selection 2020-10-18 18:34:19 -04:00
Leonwang4234
1e0545c1ec Merge branch 'wall-stats' of https://github.com/genNAowl/Mndstry into wall-stats 2020-10-18 14:29:18 -07:00
Leonwang4234
cff2799c72 remove changes in description 2020-10-18 14:29:15 -07:00
genNAowl
7a7fa74e65
Update core/src/mindustry/world/blocks/defense/Wall.java 
Co-authored-by: Summet <summet.dev@gmail.com>
 2020-10-18 14:26:48 -07:00
Anuken
fcbad69b46
Merge pull request #3014 from summetdev/patch-6 
:)
 2020-10-18 17:20:25 -04:00
Summet
8ceb155e38
:) 2020-10-19 00:14:40 +03:00
Leonwang4234
db3db47ca1 Add wall stats + other changes 2020-10-18 13:35:20 -07:00
Anuken
97fd9abd8c Merge remote-tracking branch 'origin/master' 2020-10-18 15:46:24 -04:00
Anuken
00d6997b5a Hex/bin logic number support 2020-10-18 15:46:20 -04:00
Anuken
58ff6c60aa
Merge pull request #3012 from summetdev/typo 
Grammatical fix
 2020-10-18 14:57:26 -04:00
Anuken
7fc2d6be18
Merge pull request #3010 from summetdev/units-payload 
Units payload.
 2020-10-18 14:43:23 -04:00
summetdev
bd6aebb961 fixed a typo in comment 2020-10-18 21:38:01 +03:00
summetdev
801eca5ca3 prevent sending extra packets 2020-10-18 21:26:32 +03:00
summetdev
96996f8079 merge 2020-10-18 20:28:29 +03:00
summetdev
12e35b643c sync fix 2020-10-18 20:24:09 +03:00
Summet
2e0c1cd613
code style 
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-10-18 20:07:46 +03:00
Anuken
563e99aded Fixed #3009 2020-10-18 13:02:55 -04:00
summetdev
8625ef09cc Units payload 2020-10-18 19:54:10 +03:00
Anuken
ce6292cc53 Recipe display for reconstructors 2020-10-18 11:53:36 -04:00
Anuken
ef58111cc3 Merge remote-tracking branch 'origin/master' 2020-10-18 09:29:53 -04:00
Anuken
14c42c5652 Removed issue workaround from README 2020-10-18 09:29:49 -04:00
Anuken
4cd9c0194a
Merge pull request #3008 from abomb4/master 
Try fix 'Cannot attach to current VM' problem in IDEA
 2020-10-18 09:28:33 -04:00
abomb4
7f708a3f6c
Try fix 'Cannot attach current VM' problem in IDEA 
Seems add a 'fork' option to core module solves this problem
 2020-10-18 21:15:30 +08:00
Anuken
e6606ca17e
Update bug_report.md 2020-10-18 09:11:15 -04:00