mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-15 12:24:28 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,846 Commits 4 Branches 160 Tags 2.3 GiB
95e8a603a5
Commit Graph

3846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
88ce7837a6 Partial power usage / Drill ID priority / Liquid source deselect 2019-05-02 08:56:29 -04:00
beito123
9f5a183793
Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	core/assets/bundles/bundle_ja.properties
 2019-05-02 20:08:10 +09:00
Anuken
c2a6690d24 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-05-01 20:52:02 -04:00
Anuken
5e5b719704 Added version toggle 2019-05-01 20:51:44 -04:00
L5474
4054c7d12d fix #481 + capitalization (#483) 
hope you're happy based
 2019-05-01 15:40:37 -04:00
laohuaji233
bb5e454b91
Update bundle_zh_CN.properties 
Most of them have been translated into Chinese, but there are still some uncertainties.
 2019-05-01 23:19:27 +08:00
Prosta4okua
ffb12f9c0b
Update bundle_ru.properties 2019-05-01 18:18:01 +03:00
Prosta4okua
a89786d079
Update bundle_uk_UA.properties 2019-05-01 18:17:35 +03:00
Anuken
2d3fd513d8 1 2019-05-01 11:12:27 -04:00
Prosta4ok_ua
271d01dc9d Tar fields, Overgrowth, Dart Mech Pad 2019-05-01 13:16:12 +03:00
Prosta4okua
d3ffaea042
Update bundle_uk_UA.properties 2019-05-01 11:36:13 +03:00
Anuken
404b593ab8 Merge remote-tracking branch 'origin/master' 2019-04-30 23:58:51 -04:00
Anuken
b9f1dea914 Removed gen tweaks 2019-04-30 23:57:56 -04:00
Anuken
f3385e6453 Pruned bundles 2019-04-30 23:34:41 -04:00
Anuken
a2e55f7861 Removed creeptree for now 2019-04-30 13:09:40 -04:00
Anuken
761e0114a5 Apparent typo fix 2019-04-30 12:56:57 -04:00
laohuaji233
dcae128d06 Update bundle_zh_CN.properties (#475) 
more translations
 2019-04-30 12:49:39 -04:00
J-VdS
a891a8badc NL_BE bundle progress (Fishbuilder) (#474) 
* Create bundle_nl_BE.properties

work in progress, just to save the file

* tot 148
 2019-04-30 12:47:54 -04:00
Zachary
f3ec5b533e Update bundle_ja.properties (#473) 
Translated like one name lmao
 2019-04-30 12:47:42 -04:00
Zachary
d50397edf1 Update bundle_zh_CN.properties (#472) 
Translated more block names.
 2019-04-30 12:47:32 -04:00
Deyvid67
49986f22c8 Update bundle_pt_BR.properties (#469) 2019-04-30 12:47:26 -04:00
Predator127
70f279d978 Update bundle_pt_BR.properties (#467) 
This is an updated version of the Brazillian translation, Made by Hanko
 2019-04-30 12:46:01 -04:00
VizardAlpha
84c5a75b6c Updates bundle_fr_BE.properties (#462) 
* Updates bundle_fr_BE.properties

* Update bundle_fr_BE.properties

* Update bundle_fr_BE.properties
 2019-04-30 12:45:38 -04:00
Paul T
97663e87a6 Update bundle_de.properties (#452) 
* Update bundle_de.properties

* Update bundle_de.properties
 2019-04-30 12:45:06 -04:00
laohuaji233
5956edcb8e Update bundle_zh_CN.properties (#453) 
More translations
 2019-04-30 12:44:57 -04:00
Prosta4okua
7e975f2134 Update bundle_uk_UA.properties and bundle_ru.properties (#454) 
* Update bundle_uk_UA.properties

Виправив помилку, переклав Slag.

* Update bundle_uk_UA.properties

Додав переклад дьогтю

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

Commit from Github Desktop

* Update bundle_ru.properties

* New translations was added

Salt Rocks and Pebbles

* Update bundle_ru.properties

* Update bundle_ru.properties

* New text

* Fix error

* Update bundle_ru.properties

* Add new translations

* Add Solonchaki :D

* 1
 2019-04-30 12:44:41 -04:00
키에르
40de13f9c7 Update bundle_ko.properties (#457) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

*  Apr 22, 2019

* fix typo

* Update bundle_ko.properties
 2019-04-30 12:44:08 -04:00
Dominik
70946539e3 Update bundle_pl.properties (#458) 
Translated: wave info, generate, ammo info, drill, power efficency
 2019-04-30 12:43:20 -04:00
CinExPL
996c594dfc Update bundle_pl.properties (#460) 
Improvements based on comparison with original bundle file.
 2019-04-30 12:39:00 -04:00
Anuken
d8eeb79b63 Un-debugged content 2019-04-30 12:29:19 -04:00
Anuken
cf61dd0704 Removed antialiasing due to bugs / Improved default waves 2019-04-30 12:05:01 -04:00
Anuken
6fd5f1563a Fixed incorrect power source sprite 2019-04-30 00:07:38 -04:00
Anuken
3c643c917a Map bugfixes / Sprite tweak / Zone loadout moved to dialog 2019-04-29 23:58:16 -04:00
Anuken
378be0ef86 Better Discord presence 2019-04-29 13:34:27 -04:00
Anuken
29e90969eb Removed UIUtils 2019-04-29 11:50:49 -04:00
Anuken
fb724514f3 Fixed portrait custom game dialog 2019-04-29 11:27:15 -04:00
Anuken
1f11da75d2 Push test 2019-04-29 08:34:40 -04:00
beito123
a2fa65330d
Update Japanese translations 2019-04-29 17:40:03 +09:00
beito123
d3af66b7ed
Merge remote-tracking branch 'upstream/master' 2019-04-29 17:18:16 +09:00
Anuken
fcc433fe17 Zone balancing 2019-04-28 22:03:26 -04:00
Anuken
617bdf9910 New zone maps / Dark map border / Tweaks 2019-04-28 20:25:41 -04:00
Anuken
3b2aa92eb7 Visual server respawning fix 2019-04-28 10:51:14 -04:00
Anuken
4c17b56e28 Less messy respawning / Standard starter mech / Bugfixes 2019-04-28 10:34:53 -04:00
Anuken
ad13c83f93 Fixed gen copying for earlier versions of IntelliJ 2019-04-27 09:58:14 -04:00
Anuken
768d67a8ae Updated desolate rift / Spawning fixes 2019-04-26 23:23:45 -04:00
Anuken
d827cda395 Fixed dispose() causing crash 2019-04-26 11:32:38 -04:00
Anuken
106e6c98a3 Disabled liquid ore placement 2019-04-26 11:31:55 -04:00
Anuken
e7ad797d4e Fixed unit tests 2019-04-26 11:23:41 -04:00
Anuken
6e1fb71194 Bugfixes 2019-04-25 21:53:17 -04:00
Anuken
9f5dc7f091 Fixed obscure zone test bug 2019-04-25 12:25:45 -04:00