mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 22:58:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,889 Commits 4 Branches 160 Tags 2.3 GiB
33ef1ca804
Commit Graph

82 Commits

Author SHA1 Message Date
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken
c04c825cec Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
 2020-01-08 11:00:19 -05:00
Anuken
5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
Spico (Spirit Guy)
af1b73be69 Update bundle_tr.properties (#1293) 
Fixed Line 418 not appearing at the right colour
 2020-01-08 10:20:21 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00
Joshua Fan
cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -05:00
Anuken
ce6f3ddb5a Updated bundles 2019-11-05 19:03:14 -05:00
Joshua Fan
988c424e45 Add max connections stat to power nodes (#988) 2019-11-03 13:00:32 -05:00
ZetA0545
32d0cc6dd0 Turkish translation (#916) 2019-10-28 21:25:04 -04:00
Anuken
151dca6fb9 Updated bundles 2019-10-22 20:33:52 -04:00
Tunacan427
4d91c8f8b7
Merge branch 'master' into master 2019-10-13 23:52:01 +03:00
azureblue
b43db6035f Power Lasers Transparency (#778) 
* Render each visible power link only once.

* Set power lasers opacity based on the setting

* Change power laser colors to work better with transparency

* Slightly reducing power laser width

* Change laser color to the original, minor refactoring

* Change power laser opacity setting label

* Add laser opacity setting text to bundles

* Remove "Show Power Lasers" setting as it's redundant (replaced by lasers opacity setting), changing default laser opacity setting to 100%

* Remove "setting.lasers.name" from other bundles
 2019-10-08 19:32:00 -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
Tunacan427
f06e5ed87f
Merge branch 'master' into master 2019-10-03 21:39:33 +03:00
Tunacan427
c387817157 i realised there is squash so no need to care about commits 2019-09-28 16:17:40 +03:00
Tunacan427
1f24d936d8 why do i do so many commits 2019-09-27 23:12:23 +03:00
Anuken
10ddb5f361 Bugfixes / Bundles updated 2019-09-26 15:41:42 -04:00
Tunacan427
e38d2a8380 Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-09-25 23:46:51 +03:00
Tunacan427
2220af3ac4 Even more translations 2019-09-25 23:46:46 +03:00
Kemal
f92a988612
More translation. 2019-09-25 22:29:35 +03:00
Tunacan427
7683fdb9cb Resolve merge conflict that I have no idea why happened 2019-09-25 20:06:12 +03:00
Tunacan427
d621b5a77e More translations 2019-09-25 19:58:30 +03:00
Tunacan427
02cb07f170
more translation (#4) 
yes
 2019-09-25 17:33:04 +03:00
Tunacan427
228a3f67e1 Update language files to include new stuff and a bit more translations 2019-09-25 00:31:48 +03:00
Tunacan427
7f43c4377c Merge branch 'master' of https://github.com/Tunacan427/Mindustry 2019-09-24 23:29:24 +03:00
Kemal
ab998e87f8
Translated some words. 
Not much.
 2019-09-24 23:21:47 +03:00
Tunacan427
6c53aaf67f
Fork project and edit a bit 
Nothing too much
 2019-09-24 23:00:11 +03:00
east
d53882a086 Update bundle_tr.properties (#657) 
Translated some still-English parts (will continue) and added some missing lines.
 2019-09-15 20:33:34 -04:00
Anuken
a0016f001c Updated bundles 2019-08-31 13:08:06 -04:00
Spico (Spirit Guy)
a0c281a0a9 Update to Turkish Translation (#610) 
Updated lines between 1 to 100.
Some tutorial messages are missing, going to translate them later on.
 2019-08-31 12:05:08 -04:00
Spico (Spirit Guy)
3938c199f6 Request to Reseting the Turkish Translation File (#609) 
There were some conflicting duplicated lines and someone put the file onto google translate, so some of the coloured lines were broken, and since (I think) Im the only one who edits this file (My brother didnt started translating yet) It would be easier for me to start from scratch.
 2019-08-24 14:41:59 -04:00
Anuken
da336ea412 Updated bundle texts 2019-08-23 18:14:27 -04:00
Anuken
5eadd6608d Updated bundles 2019-07-30 10:23:29 -04:00
Anuken
97eb66b0a5 Bundle update 2019-06-08 12:11:32 -04:00
Anuken
f3385e6453 Pruned bundles 2019-04-30 23:34:41 -04:00
Anuken
09a435320a Impact reactor display bugfix 2019-04-04 15:14:45 -04:00
Anuken
148f272500 New rule modifiers 2019-04-04 00:03:19 -04:00
Anuken
3f6aeac33d Cleanup of new graphical options 2019-04-02 17:18:55 -04:00
Anuken
67a12eecad Bugfixes 2019-04-02 15:52:44 -04:00
Anuken
608de34205 Updated bundles 2019-04-01 13:32:49 -04:00
Anuken
b4071f6dcb Merge 2019-03-31 18:24:25 -04:00
Anuken
6b70418861 Cleanup 2019-03-31 18:20:38 -04:00
Anuken
61f6368591 Bundle update 2019-03-28 17:31:22 -04:00
Anuken
71c2c7ad05 More code cleanup 2019-03-24 21:10:59 -04:00
Anuken
bb9573b85a Build cost/speed rules 2019-03-24 18:33:07 -04:00
Anuken
e1f53dfc67 Added bundle entries 2019-03-24 17:58:59 -04:00
Anuken
ab52c65dcf Updated bundles 2019-03-23 11:08:46 -04:00
Anuken
c7d34049fa Crash fix / Input tweak 2019-03-22 00:16:09 -04:00
Anuken
4cb92cdb06 Fixed some deployment issues 2019-03-21 00:58:06 -04:00