Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,275 Commits 4 Branches 180 Tags
cbd38003b1b160b0effc4a2caaca4cd693b6b0c0
Commit Graph
3536 Commits
Author SHA1 Message Date
Prosta4okuaandGitHub 5f4ca6e383 Update bundle_ru.properties 2018-08-02 11:57:11 +03:00
Anuken 5206079e23 Implemented sandbox mode 2018-08-01 20:13:57 -04:00
Anuken 9b01140882 Fixed merge conflicts 2018-08-01 18:44:53 -04:00
Anuken 4dae27da98 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_ru.properties
 2018-08-01 18:44:25 -04:00
Anuken f0cab65a6d Bundles updated 2018-08-01 18:38:48 -04:00
AnukenandGitHub 699a47351b Merge pull request #168 from Prosta4okua/patch-8 
[COMPLETE]Update bundle_ru.properties
 2018-08-01 18:37:51 -04:00
Anuken af004da699 Added mission completion dialog / Bundle fixes 2018-08-01 18:31:44 -04:00
Prosta4okuaandGitHub b5ad885237 Update bundle_ru.properties 2018-08-01 23:45:08 +03:00
Prosta4okuaandGitHub 07bd0fec70 Update bundle_ru.properties 2018-08-01 23:44:25 +03:00
Prosta4okuaandGitHub 318e51d736 Update bundle_ru.properties 2018-08-01 23:43:18 +03:00
Prosta4okuaandGitHub 64772c195e Update bundle_ru.properties 2018-08-01 21:17:23 +03:00
Prosta4okuaandGitHub 05ead63bdc Update bundle_ru.properties 2018-08-01 21:16:55 +03:00
Prosta4okuaandGitHub 6f5c64420d Update bundle_ru.properties 2018-08-01 20:59:45 +03:00
Prosta4okuaandGitHub d9d9a00a24 Update bundle_ru.properties 2018-08-01 20:53:01 +03:00
Predator127andGitHub e41f560ecd Fixed PT-BR 
Small fixes.
 2018-07-31 17:49:14 -03:00
Anuken 87846864cc Merge remote-tracking branch 'origin/master' 2018-07-31 12:57:48 -04:00
Anuken f3b976bdd1 All web version bugs fixed 2018-07-31 12:57:34 -04:00
AnukenandGitHub 3a06e319b0 Merge pull request #163 from toushangyouxiang/master 
Add bundle_zh_CN.properties
 2018-07-31 07:02:25 -07:00
AnukenandGitHub fe31c404ff Merge pull request #162 from Predator127/patch-3 
Huehue
 2018-07-31 07:02:16 -07:00
toushangyouxiang 5cac949ea8 fix translation 2018-07-31 21:02:25 +08:00
toushangyouxiang a35e897194 translate fix 2018-07-31 21:01:29 +08:00
toushangyouxiang 8e92edeae1 add bundle_zh_CN.properties 2018-07-31 14:25:32 +08:00
toushangyouxiang f289a0a9a8 fix name 2018-07-31 14:20:20 +08:00
toushangyouxiang 65a7e89a8c add bundle_zh_CN.properties 2018-07-31 14:17:01 +08:00
Anuken ddac5cbfbc Added unit type descriptions / Changed blast drill sprite 2018-07-30 21:20:00 -04:00
Predator127andGitHub 7cffaeb193 Huehue 
small changes
 2018-07-30 19:34:55 -03:00
Anuken 2534496543 Merge remote-tracking branch 'origin/master' 2018-07-30 17:00:24 -04:00
Anuken fe9b11e771 Fully implemented mass driver 2018-07-30 17:00:18 -04:00
Prosta4okuaandGitHub a3b0bb323f Update bundle_ru.properties 2018-07-30 19:23:06 +03:00
Prosta4okuaandGitHub a6246d27d9 [INCOMPLETE]Upt8te bundle_ru.properties 2018-07-30 19:11:25 +03:00
Predator127andGitHub 92a2f770b4 Update bundle_pt_BR.properties 2018-07-29 20:02:54 -03:00
Anuken 77f0dfb9b1 Added system to query block outputs / Editor bugfixes 2018-07-29 17:41:27 -04:00
Anuken 78d1accf07 Added resource mission 2018-07-29 12:26:48 -04:00
Anuken 2ec68a7f07 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_pt_BR.properties
 2018-07-29 12:01:52 -04:00
Anuken bbaa2a2c92 Updated bundles, removed unused text 2018-07-29 12:01:25 -04:00
TriggandGitHub 79d41ba7ac Update bundle_pt_BR.properties 
fixed some stuff for now, I guess

(Don't want to be rude, but a good chunk of Predator's translation seems to have been made by fucken google translate )
 2018-07-29 12:20:30 -03:00
Predator127andGitHub b476c47194 Update bundle_pt_BR.properties 2018-07-28 23:33:56 -03:00
Anuken b2d61a93d9 Added sector mission display and generation 2018-07-28 22:06:01 -04:00
Anuken 924b1c1a67 Fixed #156 2018-07-28 10:06:28 -04:00
Anuken 23bd9a989b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_ru.properties
 2018-07-27 09:15:24 -04:00
Anuken acfa02475b Updated bundles 2018-07-27 09:10:39 -04:00
AnukenandGitHub 9dba304011 Merge pull request #151 from Prosta4okua/patch-5 
[COMPLETE]Update bundle_ru.properties
 2018-07-27 09:09:37 -04:00
Prosta4okuaandGitHub 69b0020d15 Update bundle_ru.properties 2018-07-27 10:03:52 +03:00
Anuken ce2896cb38 Command center name added / Regression fix 2018-07-26 23:04:37 -04:00
Anuken 2a6ee6d65b Bundle cleanup 2018-07-26 14:19:58 -04:00
Prosta4okuaandGitHub 9ed4f2b7a3 Update bundle_ru.properties 2018-07-26 19:40:51 +03:00
Prosta4okuaandGitHub 7396f91a5e Update bundle_ru.properties 2018-07-26 19:39:48 +03:00
Prosta4okuaandGitHub ccc926d812 Update bundle_ru.properties 2018-07-26 19:36:26 +03:00
Prosta4okuaandGitHub bd39255ead Update bundle_ru.properties 2018-07-26 19:31:21 +03:00
Prosta4okuaandGitHub add7b1a7d9 Update bundle_ru.properties 2018-07-26 19:29:19 +03:00