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
5,245 Commits 4 Branches 160 Tags 2.3 GiB
0ac7059812
Commit Graph

5245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
c95fa25b60 Unlock bosses when defeated 2019-10-05 16:08:34 -04:00
Anuken
9e2ad3c642 Merge branches 'master' and 'zone-objectives' of https://github.com/Anuken/Mindustry 2019-10-05 16:06:57 -04:00
Anuken
a51216d7a6 Test fix 2019-10-05 16:06:36 -04:00
Anuken
a24321ae56 Mod cleanup 2019-10-05 16:05:54 -04:00
Anuken
4b99f7c819 Cleanup, bugfixes 2019-10-05 15:51:29 -04:00
Anuken
ae6925ccce Stop sounds on state change 2019-10-05 10:57:58 -04:00
dase1353
94a2ab23ba
Update bundle_zh_TW.properties 2019-10-05 19:09:11 +08:00
dase1353
b8c4f46630
Update bundle_zh_TW.properties 2019-10-05 19:06:15 +08:00
Anuken
e5c7d5dd2f Config banned blocks 2019-10-05 01:16:03 -04:00
Anuken
c1ff7812d8 Zone objective abstraction, cleanup 2019-10-05 00:21:48 -04:00
Kemal
66925bfc7f Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-10-05 03:53:44 +03:00
Kemal
e8c7bd1d32 Some small changes to translation. 2019-10-05 03:53:35 +03:00
Anuken
1b93da20f4 Workshop map listing button 2019-10-04 19:43:26 -04:00
Anuken
edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
dase1353
12164098a6
Update bundle_zh_TW.properties 2019-10-05 03:13:06 +08:00
dase1353
48145e4e77
Update bundle_zh_TW.properties 2019-10-05 03:08:45 +08:00
Anuken
df3f23731b Workshop mod loading 2019-10-04 15:06:29 -04:00
Anuken
f7b6cea21b Fast color calculation 2019-10-03 22:32:25 -04:00
Anuken
8f0eefa97e Bug report link, proper minimap colors 2019-10-03 22:26:13 -04:00
Anuken
bc02d178ce Support for zones 2019-10-03 18:53:43 -04:00
clfer
3fb1f5f54a Update bundle_fr.properties - Integrate latest bundle.properties changes 2019-10-04 00:39:07 +02:00
clfer
335bfab746 Update bundle_fr.properties - Spelling, accent, wordings, spacing 2019-10-04 00:38:21 +02:00
clfer
2d4d943b61 Update bundle_fr.properties 2019-10-04 00:37:42 +02:00
Tunacan427
f06e5ed87f
Merge branch 'master' into master 2019-10-03 21:39:33 +03:00
Tunacan427
bd777e610f
Update contributors 2019-10-03 21:27:25 +03:00
azureblue
bdcccb0344
adding missing comma 2019-10-03 19:38:54 +02:00
Anuken
35ede418eb Merge remote-tracking branch 'origin/master' 2019-10-03 12:51:32 -04:00
Anuken
46f118db13 Added link to modding guide 2019-10-03 12:51:25 -04:00
azureblue
6d2a4d4d2b
more bundle_pl translation changes 
Made a few more changes as I came across translations that were completely wrong.
 2019-10-03 18:45:28 +02:00
Ormek
7491366658 Fixed link to "bleeding edge live builds." (#768) 
Old target (Jenkins) says that it is no longer up to date and that we should look at github instead.
 2019-10-03 12:10:36 -04:00
Miguel de Dios Matias
8e0979020d Update the spanish strings. 2019-10-03 17:53:51 +02:00
Miguel de Dios Matias
7e11cd29e1 Updated and fixed some spanish translations and added empty lines and unstranslated lines from english (to keep the similar structure). 2019-10-03 17:38:49 +02:00
azureblue
6dc1a21cf0
fixing typo 
Co-Authored-By: Draco <54777154+Dr4coDragon@users.noreply.github.com>
 2019-10-03 16:51:19 +02:00
Anuken
92d7efeea2 Support for modded floors 2019-10-03 08:59:53 -04:00
Miguel de Dios Matias
f5ce5d0a78 Merge remote-tracking branch 'anuken/master' 2019-10-03 11:28:03 +02:00
Anuken
cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken
3369de6bf7 Merge remote-tracking branch 'origin/master' 2019-10-02 23:09:51 -04:00
Anuken
532926a9e3 Mod reloading that works for some ridiculous reason? 2019-10-02 23:09:35 -04:00
PlayerBrasil13
9e9d2496ed Update bundle_pt_BR.properties (#735) 
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
 2019-10-02 21:29:59 -04:00
Anuken
89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -04:00
Anuken
ffd4297b17 Mod corruption load warnings 2019-10-02 21:23:29 -04:00
Anuken
ec29bd3682 Custom sounds, mod sound loading 2019-10-02 21:03:56 -04:00
Anuken
76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
azureblue
f5b6e13a1c
Update bundle_pl.properties 
Added some missing translations and made changes to existing ones (also changing some units name).
 2019-10-03 00:51:35 +02:00
Prosta4okua
b5d2566ffd
Update bundle.properties 2019-10-03 00:12:55 +03:00
Prosta4okua
a6dcd725cb
ЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇЇ 2019-10-03 00:11:04 +03:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
7dfe2116fe
Update Logic.java 2019-10-02 09:57:17 -04:00
Anuken
525360f284
Update Control.java 2019-10-02 09:56:31 -04:00
Anuken
2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00