Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,326 Commits 4 Branches 180 Tags
8126e970f3574f760c4c083ea5efeabed262a7ac
Commit Graph
3771 Commits
Author SHA1 Message Date
Anuken 521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken 65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
Anuken 77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Anuken d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken 0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
LinandGitHub aeaba6e111 Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okuaandGitHub 0e8a677ecc Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken 4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
Anuken 82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken 25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
Anuken 486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken 51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken 5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Yuri PolyakovandGitHub 450f651c8f Update bundle_ru.properties (#6267) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2021-11-01 09:32:57 -04:00
NgLam is SIMPandGitHub 4cbc4a0bca Update Vietnamese translation for V7 (#6246) 2021-11-01 09:31:34 -04:00
VizardAlphaandGitHub 99e7fcd2d2 Update bundle_fr.properties (#6241) 
* Update bundle_fr.properties

After checking, there was some text missing to be translated.

* Minor modification
 2021-11-01 09:31:25 -04:00
Anuken c4a5a9aec0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-29 11:44:43 -04:00
FernandoandGitHub c15f82297d Update bundle_pt_BR.properties (#6127) 
* Update bundle_pt_BR.properties

Add missing translations

* Update contributors

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* h

* Update bundle_pt_BR.properties
 2021-10-27 14:39:30 -04:00
CatchearsandGitHub 15396b6032 update german translation (#6085) 
* update german translation to https://github.com/Anuken/Mindustry/commit/30e6bb2625f7201c710f5a532da2610f04431645

* typo
 2021-10-27 11:38:03 -04:00
彭瑞暄andGitHub 75a520c3ae Update TW translations (#6092) 2021-10-27 11:36:13 -04:00
JrTRinnyandGitHub d7fd7db3cc Update bundle_th.properties (#6187) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties
 2021-10-27 11:26:02 -04:00
Prosta4okuaandGitHub 144731bfb0 Update bundle_uk_UA.properties (#6213) 2021-10-27 11:25:48 -04:00
VizardAlphaandGitHub 7c1d4a092e Update bundle_fr.properties (#6227) 2021-10-27 11:25:37 -04:00
kitutaandGitHub a28ece6424 Update bundle_ja.properties (#6232) 
Add. //追加
 2021-10-27 11:25:30 -04:00
RebornTrack970andGitHub 39c5c6a6f0 TR Translation (#6239) 2021-10-27 11:25:19 -04:00
SharlotteandGitHub 77975a710c Update bundle_ko.properties (#6185) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Skskskskskk
 2021-10-27 11:25:15 -04:00
RexandGitHub d95dc98652 Update bundle_es.properties (#6238) 
* Update bundle_es.properties

please see #6226 too.

* Update bundle_es.properties
 2021-10-27 11:25:10 -04:00
Thomas WidyantokoandGitHub 7afa6a7f44 Update bundle_in_ID.properties (#6240) 
i am speed
 2021-10-27 11:25:01 -04:00
HexrotorandGitHub 65ef189921 Corrected wrong zh_CN translation (#6224) 2021-10-27 09:32:08 -04:00
LinandGitHub 5b3b2cf4d5 Update bundle_zh_CN.properties (#6216) 2021-10-27 08:38:37 -04:00
Darkness#3729andGitHub d89184da43 [RU] Translation of save search & map search (#6219) 2021-10-26 10:46:29 -04:00
Anuken aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
Anuken a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
TranquillyUnpleasantandGitHub 5c5acb2d48 Saved games search & Mapsearch filter improvements (#6194) 
* better filter menu

* remove unused bundle property

* indent

* Add text instead of using labels

* Saved game search

* Save not map

* auto cursor to search bar

* change icon to terrain
 2021-10-22 18:14:33 -04:00
Anuken d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
 2021-10-20 10:45:51 -04:00
RebornTrack970andGitHub 59435c8372 TR Translation, fix for 132 (#6176) 
* TR Translation, fix for 132

* Update bundle_tr.properties
 2021-10-17 15:24:10 -04:00
VizardAlphaandGitHub fc9abeb908 Update bundle_fr.properties (#6172) 
* Update bundle_fr.properties

More branch merging.. Commits and more..

* Added logic variable display window
 2021-10-17 15:23:59 -04:00
Prosta4okuaandGitHub ea3802bfc7 Update bundle_uk_UA.properties (#6180) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-10-17 15:23:50 -04:00
Darkness#3729andGitHub d970eb45e3 Lol (#6171) 2021-10-16 12:45:16 -04:00
Anuken b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
SharlotteandGitHub 06bf2711a4 Update [KO] bundles once again (#6147) 
* Why did you marge this

* Update bundle_ko.properties
 2021-10-16 09:49:58 -04:00
Yuri PolyakovandGitHub 91acda56c1 [RU] New blocks translated (#6159) 
* [RU] New blocks translated

ь

* Поправил 2 строчки

* а

* Еще перевел пару строк

* Поправил строчку

Как же плохо без очков
 2021-10-16 09:49:37 -04:00
JrTRinnyandGitHub 0f29a01292 Update bundle_th.properties (#6162) 2021-10-16 09:46:27 -04:00
Anuken 56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
 2021-10-14 21:00:14 -04:00
Anuken b855849e4a Merge remote-tracking branch 'origin/master' 2021-10-14 20:58:13 -04:00
Anuken 6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken 082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
 2021-10-14 19:15:59 -04:00
Anuken ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
itsragedevandGitHub d5babe88e3 Update bundle_de.properties (#6150) 
Changing some strings to match the original a little more.
 2021-10-14 11:38:25 -04:00