Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,067 Commits 4 Branches 180 Tags
d6c5d2bc10d6c7b18aa602bacefca6ff2a14d547
Commit Graph
2225 Commits
Author SHA1 Message Date
Anuken 2f7f16daff Added mend projector 2018-08-26 23:03:02 -04:00
Anuken e392c8f0e6 All reconstructors implemented / Balancing 2018-08-25 14:52:46 -04:00
Anuken 86a7f837cd Implemented halberd 2018-08-25 09:55:08 -04:00
Anuken 5e8686db77 Removed Upgrade class / Buffed units / Bugfixes 2018-08-24 09:39:02 -04:00
Anuken ee835f6514 Merge branch 'master' of https://github.com/Anuken/Mindustry into mechs-balance-altfire 
# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2018-08-24 08:57:19 -04:00
Anuken 5de61aaed3 Unlockable mechs 2018-08-24 08:55:19 -04:00
Prosta4okuaandAnuken b0103d1ce3 [Complete]Update bundle_ru.properties (#199) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-21 13:27:20 -04:00
Prosta4okuaandAnuken 9c532047d3 [Complete]Update bundle_uk_UA.properties (#201) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-08-21 13:27:09 -04:00
Anuken 6dcbe4fabb Added phase walls 2018-08-21 10:36:42 -04:00
Anuken dc6f01c0d3 Merge branch 'resource-rework' of https://github.com/Anuken/Mindustry 2018-08-20 22:09:57 -04:00
Anuken 1cc8cbe8a8 Bundles updated / Updated mechanical drill sprite 2018-08-20 22:09:15 -04:00
GureumiandAnuken c47a220721 Update bundle_ko.properties (#198) 2018-08-20 09:21:13 -04:00
Leone25andAnuken 0288daa39d Update bundle_ita.properties (#195) 2018-08-19 18:40:53 -04:00
Prosta4okuaandAnuken 3f075068a9 Update bundle_ru.properties (#196) 2018-08-19 18:40:43 -04:00
Anuken 278e7027f2 Bundles updated 2018-08-19 13:35:35 -04:00
JustYannsandAnuken 279187d13b Update bundle_fr.properties [Complete] (#146) 
* Update bundle_fr.properties

Few things translated in french.
I'll do more soon !!

* Update bundle_fr.properties V2

Update with comment of Math2128

* Update bundle_fr.properties V3

Few translations fixed

* Update bundle_fr.properties V4

•1 Thorium is the same in french and in english. 
•2 Carbide and cryofluid are not translatable !!
•3 Phase matter = "matière de Phase" doesn't sound good, I think we have to let the english word.
•4 Pyratite can be translated as "pyrrhotite" is it a good idea ?

* Update bundle_fr V5

Few translations fixed

* Update bundle_fr.properties V6 [Almost complete]

The french translation is almost finished, I will release the final translation soon.

* Update bundle_fr.properties [pre-release1]

Translation almost finished,
I just have 2 problems (see in the conversation)

* Update bundle_fr.properties  [pre-release2]

Translation almost finished
I just have 2 problems (see in the conversation)

* Update bundle_fr.properties [pre-release3]

Thank you to Math2128, for having helping me ;)

* Update bundle_fr.properties  [pre-release4]

Translations of Math2128's commit added
 2018-08-19 13:34:17 -04:00
Leone25andAnuken b2c388276f Update bundle_ita.properties (#192) 2018-08-18 18:33:49 -04:00
Prosta4okuaandAnuken 178928f866 [Complete]Update bundle_uk_UA.properties (#188) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-08-18 13:10:57 -04:00
Prosta4okuaandAnuken 7e548f9969 Update bundle_ru.properties (#191) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-18 13:10:43 -04:00
Anuken a60ce3c54c Merge branch 'master' of https://github.com/Anuken/Mindustry into resource-rework 2018-08-18 13:10:22 -04:00
UrielandAnuken dec01c23a9 [Completed] Remaking spanish translation bundle (#187) 
* started translating all the stuff

* translated more of the original english file

* translated more parts

* almost half of the file!

* MOREgit add .!

* Update bundle_es.properties

* completed

* forgot about these ones...
 2018-08-18 08:57:42 -04:00
Anuken 20021c5b31 Fixed 1-character names being valid / Fixed collideLine with tiles 2018-08-17 20:21:49 -04:00
Anuken f8d6797fc2 Fixed android module being necessary to compile 2018-08-17 18:05:28 -04:00
Anuken 25051980ce Fixed category bundle properties missing 2018-08-17 14:51:18 -04:00
AnukenandGitHub c92e8161a1 Merge pull request #190 from Prosta4okua/patch-21 
[Complete] bundle_ru.properties
 2018-08-17 11:33:29 -04:00
AnukenandGitHub 177b565d7c Merge pull request #173 from Gab351/patch-1 
Translate l227 to l239
 2018-08-17 10:38:24 -04:00
Prosta4okuaandGitHub a62b336b6c Update bundle_ru.properties 2018-08-17 12:59:51 +03:00
Prosta4okuaandGitHub 3ea61c8b3a Update bundle_ru.properties 2018-08-17 12:02:44 +03:00
Prosta4okuaandGitHub 4c57f9f902 Update bundle_ru.properties 2018-08-17 10:48:29 +03:00
Anuken 020c6388c2 Block renaming 2018-08-16 18:38:04 -04:00
Anuken 53d35e8c77 Bundles updated / Fixed some localization bugs 2018-08-16 17:43:43 -04:00
Leone25andGitHub b15c04a532 Update bundle_ita.properties 2018-08-16 21:10:04 +02:00
AnukenandGitHub d071877963 Merge pull request #186 from Leone25/patch-1 
Big update for italian bundle
 2018-08-15 13:12:18 -04:00
Leone25andGitHub bf571e595c Update bundle_ita.properties 2018-08-15 19:05:18 +02:00
Prosta4okuaandGitHub e154b5179d Update bundle_ru.properties 2018-08-15 08:27:26 +03:00
Anuken 52110d6008 ok 2018-08-14 19:30:05 -04:00
Leone25andGitHub d0ff149cca Update bundle_ita.properties 2018-08-14 21:07:39 +02:00
Leone25andGitHub b70de81c2d Update bundle_ita.properties 2018-08-14 14:41:38 +02:00
Gureumi 5e89b2568f Add korean chat fonts + fix typos 2018-08-14 15:59:07 +09:00
Leone25andGitHub fefc734bfa Update bundle_ita.properties 2018-08-12 22:24:10 +02:00
Prosta4okuaandGitHub 7f8735842c Update bundle_ru.properties 2018-08-12 22:28:23 +03:00
Prosta4okuaandGitHub a226983470 Update bundle_ru.properties 2018-08-12 19:19:07 +03:00
Prosta4okuaandGitHub 28526d0a12 Update bundle_ru.properties 2018-08-12 18:54:51 +03:00
Prosta4okuaandGitHub 913e005bae Update bundle_ru.properties 2018-08-12 10:44:56 +03:00
Prosta4okuaandGitHub 7bd9fd5bae Update bundle_ru.properties 2018-08-12 00:12:55 +03:00
AnukenandGitHub ef936214f0 Merge pull request #180 from Prosta4okua/patch-17 
[Complete]Update bundle_uk_UA.properties
 2018-08-10 10:20:43 -04:00
Prosta4okuaandGitHub ecda4d74ab Update bundle_uk_UA.properties 2018-08-10 16:12:44 +03:00
Prosta4okuaandGitHub 31124037b5 Update bundle_uk_UA.properties 2018-08-10 16:07:46 +03:00
Prosta4okuaandGitHub aaf95e0756 Update bundle_uk_UA.properties 2018-08-10 16:06:01 +03:00
Gureumi 804e311875 Update 2018-08-10 19:21:46 +09:00