Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,839 Commits 4 Branches 180 Tags
v147.1
Commit Graph
18839 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
BasedUserandGitHub 36edbbe2df Merge pull request #1 from Anuken/master 
merge with Anuken/Mindustry
 2019-10-14 13:51:32 +03:00
dase1353andGitHub a45fc2c030 Update bundle_zh_TW.properties 2019-10-14 11:43:08 +08:00
Anuken 78471c1860 Cleanup 2019-10-13 19:43:51 -04:00
Anuken 7eb3e5c0ea Radial tech tree layout 2019-10-13 19:36:47 -04:00
Anuken adc7c2bdb6 Full zoom+pan in tech tree and campaign 2019-10-13 17:53:50 -04:00
Anuken bef8b905de Added github import dialog 2019-10-13 17:14:35 -04:00
Tunacan427andGitHub 4d91c8f8b7 Merge branch 'master' into master 2019-10-13 23:52:01 +03:00
Anuken 53c842492a Tech tree zoom 2019-10-13 14:49:19 -04:00
Anuken 3d624f7eaf Added inverted sorter 2019-10-13 12:58:58 -04:00
Anuken 8366dfcece Vanguard starter mech 2019-10-13 12:38:14 -04:00
Anuken 92dacf18cd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2019-10-13 12:12:03 -04:00
Anuken 6743bd144f Nestable set iteration 2019-10-13 12:11:28 -04:00
Anuken 4b7b07460a Nestable set iteration 2019-10-13 12:09:49 -04:00
VanguardandGitHub b074c047f4 Update bundle_ru.properties 2019-10-13 18:55:30 +03:00
VanguardandGitHub a33fd5fbad Update bundle_ru.properties 2019-10-13 18:32:28 +03:00
VanguardandGitHub 597b58253c Update bundle_ru.properties 2019-10-13 18:16:59 +03:00
VanguardandGitHub 8ac844c839 Update bundle_ru.properties 2019-10-13 18:14:58 +03:00
VanguardandGitHub dd3665be16 Update bundle_ru.properties 2019-10-13 17:35:24 +03:00
VanguardandGitHub a01a888e47 Update bundle_ru.properties 2019-10-13 17:24:58 +03:00
VanguardandGitHub 6348652b0d Update bundle_ru.properties 2019-10-13 16:51:54 +03:00
VanguardandGitHub 96ff599c2d Update bundle_ru.properties 2019-10-13 16:35:26 +03:00
Anuken a09320cb4a A warning 2019-10-12 23:12:02 -04:00
Anuken c6173e70eb A warning 2019-10-12 23:11:45 -04:00
Anuken 9ef31201b6 Fixed #821 2019-10-12 21:48:45 -04:00
Anuken e7a5f0a6e6 Fixed editor variants 2019-10-12 18:45:46 -04:00
Anuken 0509c28576 Fixed bizzare single type generator initialization 2019-10-12 18:39:08 -04:00
Anuken 35c13d38a4 Base mech 2019-10-12 18:12:28 -04:00
Anuken dd3fd97b43 Updated arc 2019-10-12 16:56:43 -04:00
Anuken d973283039 Mod loading fixes 2019-10-12 15:22:54 -04:00
Max O'Cull b5bec065fe Fix mis-coloring of entity "tile" 2019-10-12 13:15:47 -04:00
Anuken 01e3bd703e Added option to initialize generators without storage properties 2019-10-12 13:10:33 -04:00
Anuken d9f98323c7 Merge remote-tracking branch 'origin/master' 2019-10-12 12:53:05 -04:00
Anuken d7ca2a33c8 Input fixes 2019-10-12 12:52:50 -04:00
Max O'Cull 243862804a Remove labels from minimap, keep on larger map 2019-10-12 12:41:26 -04:00
Lionel BergenandAnuken bd03e666da fixed issue (#816) 2019-10-11 23:54:48 -05:00
Max O'Cull 23b7176d5a Remove extraneous withLabels argument 2019-10-11 20:00:00 -04:00
Max O'Cull 120457916a Add username labels to map/minimap 2019-10-11 19:57:18 -04:00
Anuken bd3463c824 Override locale names, fixes #757 2019-10-11 18:09:56 -04:00
Anuken 4e0d1b2746 Better mod crash logs 2019-10-11 16:08:14 -04:00
Anuken b927c2df1a Hash update 2019-10-11 10:30:20 -04:00
Anuken 3f3a03c227 ???? 2019-10-11 09:32:58 -04:00
Anuken 36cec98082 ??? 2019-10-11 09:26:49 -04:00
Anuken 4f7561d66c Compile fix 2019-10-11 09:18:21 -04:00
Anuken a05ee8bbb8 Merge remote-tracking branch 'origin/master' 2019-10-11 09:15:30 -04:00
Anuken 21b7a0235b Attempting to fix github CI 2019-10-11 09:14:43 -04:00
키에르andAnuken f01e486edb DepositEvent first (#811) 
* Update EventType.java

* Update InputHandler.java
 2019-10-11 00:35:29 -04:00
Anuken 204332a76a Mobile input fixes 2019-10-10 22:13:45 -04:00
Anuken 80a4e67ddf Better replacement 2019-10-10 16:47:46 -04:00
Anuken 6e7baf42b1 Fixed encoding 2019-10-10 16:03:12 -04:00
Anuken 36a21e2443 Variant fixes 2019-10-10 09:13:12 -04:00