mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,060 Commits 4 Branches 160 Tags 2.3 GiB
65f36faf71
Commit Graph

168 Commits

Author SHA1 Message Date
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
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Rex
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
Angel-24
5b3ae4ae15
[ES] Updated spanish translation (#6031) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Updated line 125

Remove suggestion of changing auto-disabling mods setting when the game crashes, just what Anuke did in the original bundle.
 2021-10-12 14:16:22 -04:00
Rex
be0397355f
br (#5990) 2021-09-13 21:08:42 -04:00
Rex
d36a00a6fe
update bundle_es.properties (#5989) 
* Update bundle_es.properties

* Update bundle_es.properties

* 131

* support units

* fixed
 2021-09-13 20:08:40 -04:00
Anuken
7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Angel-24
2b757fe107
Update bundle_es.properties (#5526) 
Updated Spanish trasnlations to the 1 - Jul - 2021 changes in "bundle.properties".
 2021-07-12 14:47:17 -04:00
BlueTechno
51f7858b78
Added "armor" and "buildingdamage" stats (#4794) 
Also fixed the description of the separator (so it matches the english description)
 2021-03-05 11:30:45 -05:00
BlueThecno
6de53343a4
Fixing typos and descriptions [bundle_es.properties] (#4727) 
* Fixing and descriptions [bundle_es.properties]

* Forgot something
 2021-02-19 18:32:17 -05:00
ZirKNkium611
ae921bf266
Update bundle_es.properties (#4027) 
* Update bundle_es.properties

correcting and improving some translations

* Update bundle_es.properties

correcting team names
 2021-01-19 15:22:47 -05:00
Antsiferov Andrew
43757a247e
[QoL] Chat modes (#3869) 
Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).
 2020-12-24 16:05:41 -05:00
Anuken
91692f362f Mod browser cleanup 2020-12-17 21:17:55 -05:00
Angel_24
b12cac7b30
Update bundle_es.properties (#4002) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

* Tweaks from a newer pull request

Added changes based on the Frankz30's Pull request: [ https://github.com/Anuken/Mindustry/pull/3879#issue-534932998 ]

* Added translations for wheather graphics and report bugs options
 2020-12-16 19:41:07 -05:00
Angel_24
4e00c4b015
Update bundle_es.properties 2020-12-05 14:06:20 +01:00
Angel_24
a8a629c5ef
Update bundle_es.properties 2020-12-04 11:24:25 +01:00
Angel_24
8e6dd98a5a
Update bundle_es.properties 2020-12-04 10:44:15 +01:00
Angel_24
2af988d71f
Update bundle_es.properties 
Just one more little tweak
 2020-12-03 19:51:51 +01:00
Angel_24
63318f9b67
Update bundle_es.properties 
Minnor changes
 2020-12-03 19:47:00 +01:00
Angel_24
7f032edd6f
Update bundle_es.properties 
added servers disclaimer
 2020-12-03 19:37:12 +01:00
Angel_24
aff5b8bed6
Update bundle_es.properties 
New hints translated
 2020-12-03 19:28:01 +01:00
Angel_24
7e5c69a107
Update bundle_es.properties 2020-11-27 13:07:38 +01:00
Angel_24
40dd3d5677
Update bundle_es.properties 2020-11-27 10:07:38 +01:00
Angel_24
d1563ee55e
Merge branch 'master' into patch-2 2020-11-26 10:43:13 +01:00
Angel_24
fa3a19d766
Update bundle_es.properties 2020-11-26 08:52:46 +01:00
Angel_24
0d4add667f
Update bundle_es.properties 2020-11-26 08:49:44 +01:00
Angel_24
7f214f1343
Update bundle_es.properties 2020-11-26 08:47:11 +01:00
Angel_24
1cc73a4077
Finished Spanish Translation, for now... 2020-11-25 21:26:24 +01:00
Angel_24
a693289867
Update bundle_es.properties 2020-11-25 20:57:32 +01:00
Angel_24
1467a3a7fd
Update bundle_es.properties 2020-11-25 14:59:07 +01:00
Angel_24
2a618a6600
Update bundle_es.properties 2020-11-25 10:36:48 +01:00
Angel_24
38f4154d18
Update bundle_es.properties 2020-11-24 10:47:35 +01:00
Angel_24
8004b6ce1d
Update bundle_es.properties 2020-11-24 09:39:08 +01:00
Angel_24
6f75116197
Update bundle_es.properties 2020-11-23 20:06:37 +01:00
Angel_24
143be734c5
Update bundle_es.properties 2020-11-23 14:13:23 +01:00
Angel_24
ad6a3bf150
Update bundle_es.properties 2020-11-23 11:29:07 +01:00
Angel_24
07b12890e8
Update bundle_es.properties 2020-11-20 18:14:55 +01:00
Angel_24
c014f86f2b
Update bundle_es.properties 
"Titanium" conveyor duplicated on "Plastanium"
 2020-11-20 17:39:52 +01:00
Angel_24
ef2ff385b8
Añadido el "cada" de nuevo 
Sabía que se me olvidaba algo, pero no tuve tiempo de revisarlo.
 2020-11-19 19:21:40 +01:00
Angel_24
31d401340c
Update bundle_es.properties 2020-11-19 14:57:16 +01:00
Angel_24
c3df430a4e
Update bundle_es.properties 2020-11-19 14:56:12 +01:00
Angel_24
071d98dbfa
Update bundle_es.properties 2020-11-18 20:48:12 +01:00
Volas171
53e655698b
Update bundle_es.properties 2020-10-28 08:32:23 -05:00
Volas171
d91dd2548d
Merge branch 'master' into patch-1 2020-10-27 15:05:36 -05:00
Anuken
f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
Anuken
a1de6e5288
Merge branch 'master' into patch-7 2020-10-23 09:30:23 -04:00
Volas171
dec9e8d4aa
Merge branch 'master' into patch-1 2020-10-21 10:53:20 -05:00