Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,072 Commits 4 Branches 180 Tags
414b538e6b07939afa3970620cc151d9aebeb18b
Commit Graph

2920 Commits

Author SHA1 Message Date
TheSlaylord
ae472fb03d Update bundle_ru.properties (#1931) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2020-04-28 15:05:41 -04:00
Kittiskov
58cbfa599a Update(Not complete yet) (#1381) 
I didn't update all these yet, because I have to sleep (yawn).

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-04-28 14:16:40 -04:00
Daan Breur
40ea1c865d [LANG] NL Some Small Changes (#1546) 2020-04-28 12:32:09 -04:00
Lapis
1836cf9582 Update bundle_ja.properties (#1930) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-28 12:27:07 -04:00
GioIacca9
eef4137a59 Updated bundle_it to dfcf11f (#1929) 2020-04-28 12:27:00 -04:00
Prosta4okua
ab0cb0c019 Ukrainian translation (#1924) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (fixed)

confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (yet again)

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Стан з гілки master взято

* Оновлено на 26.04.2020

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2020-04-28 12:26:52 -04:00
sk7725
14de9d7f5f 6.0 unit and block Korean Translation #1 (#1936) 2020-04-28 12:25:31 -04:00
Wina
621fa7862c Updated Spanish Bundle (#1937) 
* Minor fixes

* Added Plastanium Conveyor Translation
 2020-04-28 12:25:11 -04:00
Anuken
2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
Anuken
f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Anuken
1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Patrick 'Quezler' Mounier
5fc8901e0b Fix plastanium conveyor icon generation (#1920) 2020-04-26 11:08:27 -04:00
Lapis
02fbc56137 Update bundle_ja.properties (#1917) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-26 11:08:05 -04:00
Anuken
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
Anuken
c875bb3f55 Merge remote-tracking branch 'origin/master' 2020-04-25 17:34:39 -04:00
Anuken
ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
Gdeft
9260cdee95 Update in bundle_in_ID.properties (#1913) 
Translated few words to Bahasa and revised some of them too so they sound more standard.
 2020-04-25 13:38:06 -04:00
Lapis
d97d971cf6 Update bundle_ja.properties (#1908) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties
 2020-04-25 13:38:00 -04:00
Anuken
9e0af97cee Merge remote-tracking branch 'origin/master' 2020-04-25 12:30:22 -04:00
Anuken
838e12cc0a stop 2020-04-25 12:30:18 -04:00
sk7725
02394973b0 Fix inconsistencies in Korean Translation (#1912) 
For block, the national institute of korean language(https://www.korean.go.kr/front/onlineQna/onlineQnaView.do?mn_id=216&qna_seq=81761) specifies that the correct translation is 블록, not 블럭. Both translations, despite 블럭 being the wrong translation, are being used. All 블럭 have been changed to 블록.
 2020-04-25 12:24:56 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken
21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken
6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Anuken
5d4ca753a7 Light cleanup 2020-04-24 11:08:02 -04:00
Anuken
1b2e10d355 Cleanup, re-implementations 2020-04-24 11:01:17 -04:00
Patrick 'Quezler' Mounier
cf186e0219 Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites2.png
 2020-04-23 21:15:11 +02:00
Patrick 'Quezler' Mounier
39266d23c8 Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
cafd076f9c Fixed water animation conflict 2020-04-23 15:08:32 -04:00
Anuken
87ed405916 Bugfixes 2020-04-23 14:50:30 -04:00
Anuken
7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
Anuken
cec5c24d69 progress 2020-04-23 13:58:06 -04:00
laohuaji233
37240478b8 Update bundle_zh_CN.properties (#1900) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2020-04-23 11:08:33 -04:00
Álvaro Manzanas
cf69fa1d7c Update bundle_es.properties (#1899) 
* Update bundle_es.properties

* Update bundle_es.properties
 2020-04-22 16:20:07 -04:00
Kaio Duarte Costa
390b5e3b60 Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Patrick 'Quezler' Mounier
32e32ecae2 Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Patrick 'Quezler' Mounier
1acc6461e6 Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier
9864383300 Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier
41eb51a340 Experiment with visible ports 2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier
79a095faa8 Merge branch '6.0' into crater 2020-04-16 20:30:13 +02:00
Patrick 'Quezler' Mounier
a05f4338c5 Waspify the crater 🐝 2020-04-16 20:24:07 +02:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Corby
15750b5eb0 Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Patrick 'Quezler' Mounier
589d4c92d1 Scale crater from 16x16 to 20x20 2020-04-16 18:39:24 +02:00
Patrick 'Quezler' Mounier
83511368f6 Stash shadow draft 2020-04-16 17:44:43 +02:00
Patrick 'Quezler' Mounier
a1d4804fae Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00