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

2192 Commits

Author SHA1 Message Date
Anuken
7a770d8aed Merge pull request #2696 from YellOw139/patch-4 
[Bundle][RO] Translation Update
 2020-10-13 18:06:31 -04:00
Anuken
77458e1e4d Merge pull request #2694 from PetrGasparik/v106-alpha 
[v107-alpha] Czech translation - update
 2020-10-13 18:06:16 -04:00
Anuken
64cae7d877 Merge pull request #2693 from laohuaji233/patch-38 
Update bundle_zh_CN.properties(finished)
 2020-10-13 18:06:07 -04:00
Anuken
0e544825f9 Merge pull request #2481 from Pietro303HD/patch-2 
some small changes, and also removed a typo
 2020-10-13 18:03:56 -04:00
Anuken
3bf80e6732 Merge pull request #2420 from DaGamerFiles/patch-1 
Indonesian translation
 2020-10-13 18:03:47 -04:00
Anuken
4bf2b3b43e Now in beta 2020-10-13 16:18:11 -04:00
Anuken
d4c72b2a9c Merge pull request #2915 from genNAowl/pierce-cap-info 
Add `pierceCap` Info
 2020-10-13 10:53:17 -04:00
Leonwang4234
24d295a924 add infinitepierce + bugfixes 2020-10-12 17:57:00 -07:00
Anuken
f10c5c1ca8 Merge remote-tracking branch 'origin/master' 2020-10-12 10:06:41 -04:00
Anuken
378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
Wiki Updater
08629bb7f7 add bundle entry for dacit boulder 2020-10-12 10:49:41 +02:00
Leonwang4234
7f5561f037 add... 2020-10-11 17:03:48 -07:00
YellOw139
8ed6f1e3a8 Updates until commit 3fe79531a6 2020-10-11 21:01:37 +03:00
Anuken
3fe79531a6 Added message for last accessed player of block 2020-10-11 11:47:22 -04:00
Anuken
e11a8565d0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
 2020-10-11 10:51:46 -04:00
Anuken
3d99e38f10 Sector simplification 2020-10-11 10:51:33 -04:00
Patrick 'Quezler' Mounier
6d632fc532 Update bundle.properties 2020-10-11 14:59:44 +02:00
Anuken
3f74c61c0a Map center button 2020-10-10 12:05:11 -04:00
Pietro303HD
2e4cbdcc05 Update bundle_pt_BR.properties 2020-10-10 09:51:23 -03:00
Patrick 'Quezler' Mounier
d776744905 Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Petr Gašparík
38ef46aa41 Czech translation - update for commit 7088ae8 2020-10-06 10:09:24 +02:00
Petr Gašparík
91875ec45f Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-06 10:06:06 +02:00
Anuken
7088ae89b3 Logic unit control 2020-10-05 15:42:37 -04:00
Petr Gašparík
bf4b01e46c name change 2020-10-05 12:05:53 +02:00
Petr Gašparík
cbb1058dc7 Merge branch 'v106-alpha' of https://github.com/PetrGasparik/Mindustry into v106-alpha 2020-10-05 12:04:38 +02:00
Petr Gašparík
26f6bcccb7 Czech - up to date for commit 14156c1 2020-10-05 12:04:35 +02:00
Petr Gašparík
81e4fb3759 Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-05 11:56:55 +02:00
Petr Gašparík
55be1fd969 Apply suggestions from code review 
Co-authored-by: Roman Plášil <me@rplasil.name>
 2020-10-05 11:55:01 +02:00
TheMrAlbert
c1be33cf2f Minor update 
These are the minor translations, please review this translation before merging.
Also, block.consecutive (line 611) are left untranslated to allow other translator who are capable to translate it well.
 2020-10-04 12:45:08 +07:00
grimsoul10
5d2c36f186 Small changes (#1) 
* Small changes
* Capitalizations
 2020-10-04 10:48:48 +07:00
Thomas Widyantoko
3e49c68ec2 Updated for missing lines 2020-10-04 10:08:42 +07:00
老滑稽
04b03b0749 Update bundle_zh_CN.properties 2020-10-02 08:19:31 +08:00
老滑稽
b7b2da6bbd Update bundle_zh_CN.properties 2020-10-01 21:01:30 +08:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken
7eb0da82de Added enemy lights setting 2020-09-30 17:44:13 -04:00
YellOw139
09934d9e12 Foreshadow 2020-09-30 19:15:52 +03:00
slava0135
d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
 2020-09-30 09:48:18 +03:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
Thomas Widyantoko
d86813bbb3 Merge branch 'master' into patch-1 2020-09-30 07:12:28 +07:00
Petr Gašparík
250150a30c Czech cleanup 2020-09-28 10:24:50 +02:00
Petr Gašparík
8ce6520fca Czech translation . update up to commit 9e0b29b 2020-09-28 00:03:51 +02:00
Petr Gašparík
53b556941c Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-27 23:50:48 +02:00
slava0135
3e81d194cb New liquid turret - Tsunami 2020-09-25 11:49:04 +03:00
YellOw139
08e6b4f2d7 Multiplayer note and the latest cleanup 2020-09-25 10:48:52 +03:00
老滑稽
8132cd9ba7 Update bundle_zh_CN.properties 2020-09-25 12:29:37 +08:00
Anuken
9e0b29b3dd Cleanup 2020-09-24 18:11:10 -04:00
Anuken
504334999d Campaign multiplayer note 2020-09-24 16:49:04 -04:00
老滑稽
1607a96a6a Update bundle_zh_CN.properties 2020-09-25 00:17:43 +08:00
老滑稽
f5c8d0bf52 Update bundle_zh_CN.properties 2020-09-25 00:12:45 +08:00