Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,404 Commits 4 Branches 180 Tags
ba982a73b800cdfffc2f9e2ec2c5b6fe33fa43d0
Commit Graph

2240 Commits

Author SHA1 Message Date
Anuken
c1ff7812d8 Zone objective abstraction, cleanup 2019-10-05 00:21:48 -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
Anuken
edb0ece03b More mod content support 2019-10-04 19:14:45 -04:00
dase1353
12164098a6 Update bundle_zh_TW.properties 2019-10-05 03:13:06 +08:00
dase1353
48145e4e77 Update bundle_zh_TW.properties 2019-10-05 03:08:45 +08:00
Anuken
912a40c9cd Cleanup 2019-10-03 22:39:57 -04:00
Anuken
8cd013d2ab Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry into lights 2019-10-03 22:32:53 -04:00
Anuken
8f0eefa97e Bug report link, proper minimap colors 2019-10-03 22:26:13 -04:00
Anuken
bc02d178ce Support for zones 2019-10-03 18:53:43 -04:00
clfer
3fb1f5f54a Update bundle_fr.properties - Integrate latest bundle.properties changes 2019-10-04 00:39:07 +02:00
clfer
335bfab746 Update bundle_fr.properties - Spelling, accent, wordings, spacing 2019-10-04 00:38:21 +02:00
clfer
2d4d943b61 Update bundle_fr.properties 2019-10-04 00:37:42 +02:00
Tunacan427
f06e5ed87f Merge branch 'master' into master 2019-10-03 21:39:33 +03:00
Tunacan427
bd777e610f Update contributors 2019-10-03 21:27:25 +03:00
azureblue
bdcccb0344 adding missing comma 2019-10-03 19:38:54 +02:00
Anuken
46f118db13 Added link to modding guide 2019-10-03 12:51:25 -04:00
azureblue
6d2a4d4d2b more bundle_pl translation changes 
Made a few more changes as I came across translations that were completely wrong.
 2019-10-03 18:45:28 +02:00
Miguel de Dios Matias
8e0979020d Update the spanish strings. 2019-10-03 17:53:51 +02:00
Miguel de Dios Matias
7e11cd29e1 Updated and fixed some spanish translations and added empty lines and unstranslated lines from english (to keep the similar structure). 2019-10-03 17:38:49 +02:00
azureblue
6dc1a21cf0 fixing typo 
Co-Authored-By: Draco <54777154+Dr4coDragon@users.noreply.github.com>
 2019-10-03 16:51:19 +02:00
Anuken
cce0040eaf why does this work 2019-10-02 23:17:06 -04:00
Anuken
3369de6bf7 Merge remote-tracking branch 'origin/master' 2019-10-02 23:09:51 -04:00
Anuken
532926a9e3 Mod reloading that works for some ridiculous reason? 2019-10-02 23:09:35 -04:00
PlayerBrasil13
9e9d2496ed Update bundle_pt_BR.properties (#735) 
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
 2019-10-02 21:29:59 -04:00
Anuken
ffd4297b17 Mod corruption load warnings 2019-10-02 21:23:29 -04:00
Anuken
76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
azureblue
f5b6e13a1c Update bundle_pl.properties 
Added some missing translations and made changes to existing ones (also changing some units name).
 2019-10-03 00:51:35 +02:00
Anuken
2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00
Miguel de Dios Matias
56cc806d01 Fixed the spanish translation 'silicona' -> 'silicio'. (#758) 2019-10-01 11:55:31 -04:00
cheese1
4f2bfb2406 Update bundle_de.properties (#752) 2019-09-30 17:42:31 -04:00
Anuken
7cd220fe8c Display more launch info / Store mod list in saves 2019-09-29 23:40:23 -04:00
Anuken
7fccd18910 Server mod checking 2019-09-29 22:59:23 -04:00
Anuken
73e9f55e55 More tutorial info 2019-09-29 21:51:45 -04:00
Anuken
002a052371 Fixed #748 / Better mod loading 2019-09-29 21:41:32 -04:00
Anuken
0049a0004e Block rotation / Mod loading improvements 2019-09-29 19:54:52 -04:00
Anuken
b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties
 2019-09-29 17:03:28 -04:00
Prosta4okua
2b8878e724 Ukrainian language (#715) 
* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

* gmmm

/-/-/-/

* idk what i changed

* Обновление и корректировка строк с 1 по 90

* router

* Обновление и корректировка строк с 87 по 252

Обновление и корректировка строк с 87 по 252, а так же правка предыдущих.
- 35 строку лучше привести в соответствии с оригинальным текстом, без дополнений и пояснений.
- 103 строка не переводится в соответствии с https://semver.org/lang/ru/ , хотя это не жёсткое правило, поскольку не влияет непосредственно на алгоритм работы с версиями.
- 187 Предлагаю эту строку перевести как 'Настройки карты', не смотря на оригинальный текст (соответственно и 230, 231).

* router

* Create description.txt

* Update description.txt

* Create short-description.txt

* Create achievements.vdf

* Update achievements.vdf

* Update bundle_uk_UA.properties

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* 000b23d703
^
 2019-09-29 12:53:52 -04:00
Anuken
63744c0a3a 'belts' 2019-09-29 12:39:59 -04:00
Anuken
c6bc398950 Texture packing 2019-09-29 11:26:25 -04:00
Anuken
79554bf8e9 Mod import/export dialog, restarting 2019-09-28 23:26:55 -04:00
Anuken
92a3f150bb Thruster fix / Removed info on Steam to prevent confusion 2019-09-28 15:40:31 -04:00
Anuken
000b23d703 Workshop crash fix / Mine balancing 2019-09-28 15:14:29 -04:00
Anuken
438b3d9752 Workshop map updates, removal detection 2019-09-28 13:13:23 -04:00
Tunacan427
c387817157 i realised there is squash so no need to care about commits 2019-09-28 16:17:40 +03:00
Anuken
138a9ffae7 Experimenting with light 2019-09-27 22:59:02 -04:00
Anuken
8609400d76 Ask players if they want to make games public 2019-09-27 20:39:30 -04:00
Tunacan427
1f24d936d8 why do i do so many commits 2019-09-27 23:12:23 +03:00
Anuken
f3ab8f34ed Steam bugfixes 2019-09-26 19:18:10 -04:00
Anuken
3f87d64e54 Merge remote-tracking branch 'origin/master' 2019-09-26 15:41:48 -04:00