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

2453 Commits

Author SHA1 Message Date
Anuken
d3747f0d4c Content loading improvements 2019-12-07 15:41:52 -05:00
Anuken
dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken
06abc43aea Fixed slow imports 2019-12-07 11:37:13 -05:00
Anuken
93fd6c5bd6 Removed massive import wall 2019-12-07 01:51:09 -05:00
Anuken
96aa3ccee0 Various improvements 2019-12-07 00:34:27 -05:00
Anuken
f3a5798a7f Various fixes 2019-12-06 22:24:32 -05:00
Anuken
2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
Vanguard
044dac6a9e Merge branch 'master' into master 2019-12-06 18:20:05 +03:00
Vanguard
7f3f27a91e 1 new line, 1 changed line 
New:
mod.item.remove

Changed:
mode.attack.description
 2019-12-06 18:00:20 +03:00
Anuken
ef24e5ecad Merge remote-tracking branch 'origin/master' 2019-12-05 22:06:57 -05:00
Anuken
6f146c6cad Added support for mod map/schematic packs 2019-12-05 21:15:28 -05:00
Ali-C-Ila
db5bd7eea8 Update bundle.properties (#1164) 2019-12-05 10:01:47 -05:00
itskatt
ba982a73b8 Remove e 
Co-Authored-By: Paulao17 <paul@shimaore.net>
 2019-12-04 19:59:51 +01:00
Anuken
c85847567d h 2019-12-03 18:03:21 -05:00
Martin Gebert
c08aa1f3d6 add and fix some German translations 2019-12-03 23:16:58 +01:00
Anuken
1e3bfba31a this engine is also broken 2019-12-03 17:16:23 -05:00
Anuken
9e3870acbe Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
#	gradle.properties
 2019-12-02 22:45:05 -05:00
Anuken
9cb55b9745 a mess 2019-12-01 14:21:47 -05:00
itskatt
04d3c40baa Apply suggestions from review 
Co-Authored-By: YaFou <33806646+YaFou@users.noreply.github.com>
 2019-12-01 18:36:25 +01:00
Anuken
0e7c403bd8 Tweaks 2019-12-01 12:32:35 -05:00
itskatt
77e0e46a17 Update the French Translation 2019-12-01 16:52:39 +01:00
Ali-C-Ila
ae981053b2 Update bundle_zh_TW.properties (#1133) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-01 00:10:51 -05:00
PlayerBrasil13
23f90fcaf4 Update bundle_pt_BR.properties (#1128) 
Translated the last PR's added lines, fixed some portuguese errors.
 2019-12-01 00:08:40 -05:00
Prosta4okua
765d9703f5 Ukrainian translation (#1144) 
* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* 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
 2019-12-01 00:04:35 -05:00
Anuken
3abcdf2063 Better access 2019-11-30 17:45:02 -05:00
valtsu41
5411ae777e Starting bundle_fi.properties (#900) 2019-11-28 22:04:58 -05:00
Anuken
57f9aeee86 Public block fields / Better scripting 2019-11-27 13:51:07 -05:00
Anuken
1e1b84a201 Merge branches 'master' and 'mod-spritepack-refactor' of https://github.com/Anuken/Mindustry 2019-11-25 23:55:18 -05:00
Felix Corvus
932c32ad8f byte-logic draft translations 
Зная скорость Анюка
 2019-11-26 06:40:59 +03:00
Anuken
a5fbc07561 Texture overrides / Potential mod texture binding optimizations 2019-11-25 20:50:32 -05:00
Felix Corvus
2631c4f7af adding millions & thousands localisation (#1132) 
* "mil" / "k" localisation adding

* "mil" / "k" localisation adding

* Update bundle.properties

* Update bundle_ru.properties
 2019-11-25 20:48:53 -05:00
Ali-C-Ila
c2c5836752 Update bundle_zh_TW.properties (#1131) 2019-11-25 14:48:24 -05:00
Vanguard
6a15328854 1 new line added 
item.corestorable
 2019-11-25 16:42:40 +03:00
matheod
dabdd094f9 Add storable indication in core database (#1124) 
* Add storable in core indication in core database

* Add corestorable text

* French translation of corestorable
 2019-11-24 01:35:16 -05:00
PlayerBrasil13
6f48e7a5ed Update bundle_pt_BR.properties (#1122) 
Added some lines that are in bundle.properties and was missing in bundle_pt_BR.properties
 2019-11-23 20:43:00 -05:00
Ali-C-Ila
98bca1740c Update bundle_zh_TW.properties (#1118) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-11-23 15:16:49 -05:00
CinExPL
51842a61a8 Update bundle_pl.properties (#1119) 
Improvements based on comparison with original bundle file + small fixes
 2019-11-23 15:16:32 -05:00
YFdyh000
686b892ea9 Update bundle_zh_CN.properties (#1113) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2019-11-22 21:00:11 -05:00
osoitz
ffcfaf1610 Update bundle_eu.properties (#1114) 2019-11-22 20:59:42 -05:00
Vanguard
2136ae03a5 1 new line, 1 changed line 
New:
settings.resetKey

Changed:
mech.dart-ship.description
 2019-11-23 02:18:58 +03:00
DeltaNedas
38804462a9 add reset keybind to english locale (#1116) 
* updated english locale for "reset key".

* Update bundle.properties

* Update bundle.properties
 2019-11-22 16:17:11 -05:00
Anuken
6d6fac00d7 Less hacky support for atrocious json 2019-11-22 15:33:01 -05:00
Vanguard
d0803ef45c 1 new line added 
mod.requiresversion
 2019-11-22 17:07:04 +03:00
Anuken
2c61fcdfa6 Added optional mod minimum game version 2019-11-21 21:12:05 -05:00
Yuuto Tokuhara
289e4f29ef Update bundle_ja.properties (#1108) 
translated somethings
 2019-11-21 15:49:26 -05:00
itskatt
1482695f6e Update the French Translation (#1010) 
* translate

* Sync the bundle, translation fixes and revisions

* e

* Translate newest additions

* sync with cafd95859f

* é

* Translate new additions

* ééééééééé

* Apply suggestions from translation review

Co-Authored-By: YaFou <33806646+YaFou@users.noreply.github.com>
 2019-11-21 15:49:04 -05:00
Vanguard
5e51b43367 Update bundle_ru.properties 2019-11-21 17:27:06 +03:00
ballgamer56
10376ee59d Thai trabslation 
Took me a week to finish :3
 2019-11-21 07:53:13 +07:00
AmateurPotion
6ec0ff9442 Update bundle_ko.properties (#1044) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2019-11-20 13:28:53 -05:00
Ali-C-Ila
0693480633 Update bundle_zh_TW.properties (#1103) 2019-11-20 13:26:35 -05:00