mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 13:09:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,813 Commits 4 Branches 160 Tags 2.3 GiB
6caf0fc1cc
Commit Graph

566 Commits

Author SHA1 Message Date
Timmeey86
17e0489164 Improved descriptions of Container, Vault and Mend Projector (#312) 2018-11-07 14:09:26 -05:00
Valentin Sonin
a670ac0aea upd bundle_ru.properties (#310) 
add lines 768, 769,770
 2018-11-07 12:41:30 -05:00
elmenda452
ef30018008 Update bundle_es.properties (#311) 
Translated the entire tutorial, and a few more things.
 2018-11-07 12:41:19 -05:00
elmenda452
66810c8b75 Update bundle_es.properties (#309) 
Just translating a few things.
 2018-11-07 00:11:53 -05:00
Anuken
2bba55ebd5 Clearer nuclear reactor output 2018-11-07 00:07:41 -05:00
Anuken
b977ae4d3b Updated bundles / Unbroke wave table 2018-11-06 23:56:11 -05:00
Anuken
d4f5e854c5 Misc. cleanup of UI / Removed 'font scale' var / Removed [orange] 2018-11-06 23:47:23 -05:00
Anuken
837f621633 Merge branch 'freetype' of https://github.com/Anuken/Mindustry 2018-11-06 21:01:21 -05:00
Anuken
a73a75a7f8 Cyrillic, chinese, korean fonts 2018-11-06 20:55:18 -05:00
키에르
1f9ebc7295 Update bundle_ko.properties (#308) 2018-11-06 11:11:56 -05:00
키에르
2e6c9d408c Update (#304) 
* Update bundle_ko.properties

* remove text.unit.none
 2018-11-04 09:25:10 -05:00
키에르
f3bea49f61 'Unkown' (#302) 2018-11-04 09:22:39 -05:00
Anuken
64f2ee67b2 New sector dialog done 2018-11-04 00:09:25 -04:00
Anuken
19d34779a0 New sector dialog done 2018-11-04 00:08:06 -04:00
Anuken
76a6a0cf75 Fixed crash when trying to open non-existent map 2018-11-03 09:39:59 -04:00
Anuken
da47d97cd0 Removed unused descriptions / Re-ordered all files 2018-11-03 09:28:47 -04:00
Anuken
f59441005e New sorted update script 2018-11-03 09:17:03 -04:00
Anuken
930e25e64a Sector edges 2018-11-02 20:53:08 -04:00
Timmeey86
963269a685 Added descriptions for all unlockables which didn't have them (#297) 
* Added english descriptions for walls and doors

* Added english descriptions for walls and doors

* Added descriptions for projectors, mine and turrets

* Added descriptions for transport blocks and two smelters

* Added descriptions for crafters

* Added descriptions for power-related items and containers

* Added descriptions for drills and extractors

* Added descriptions for ship/mech pads

* Added/updated unit/factory descriptions

* Added english descriptions for walls and doors

* Added descriptions for projectors, mine and turrets

* Added descriptions for transport blocks and two smelters

* Added descriptions for crafters

* Added descriptions for power-related items and containers

* Added descriptions for drills and extractors

* Added descriptions for ship/mech pads

* Added/updated unit/factory descriptions

* Added descriptions for liquids and related blocks.

* Updated descriptions based on discord discussion.

* Updated descriptions as requested by Anuken

* Updated shock mine description
 2018-11-02 19:49:56 -04:00
Anuken
208ae6183c Merge 2018-11-02 19:45:31 -04:00
Timmeey86
b6b3997498 Fixed false friend translation (#295) 2018-11-02 10:30:59 -04:00
키에르
dc4812a86e Update bundle_ko.properties (#294) 2018-11-02 08:46:43 -04:00
Baramos666
fc83b0d95b Update bundle_fr.properties (#293) 2018-11-01 20:12:41 -04:00
Anuken
8bf68aa020 Cleanup 2018-11-01 09:09:12 -04:00
Anuken
5b01d923d3 Full error localization 2018-10-28 23:50:30 -04:00
Anuken
108e5a2f5e Non-blocking connect / Localized connect error messages 2018-10-28 23:47:28 -04:00
Anuken
2a21e7c2cb Merge remote-tracking branch 'origin/master' 2018-10-28 00:31:32 -04:00
Anuken
d281277797 Balancing, bugfixes 2018-10-28 00:31:28 -04:00
키에르
fb807bcde4 Update bundle_ko.properties (#278) 2018-10-27 21:26:32 -04:00
Anuken
a810e704ad Renamed ""oil"" / Increased phase fabric boost 2018-10-26 16:06:47 -04:00
MMG
da6a8f806d Adds a few translations (#273) 2018-10-26 10:55:15 -04:00
키에르
b47f44cacd Add texts in font (#275) 
* Add texts in font

* Update bundle_ko.properties

POEditor is break word spacing..
 2018-10-26 10:54:42 -04:00
Anuken
6c076863db "silcion" 2018-10-26 00:11:58 -04:00
Anuken
2094bc3d80 Renamed phase matter to reduce conflicts / Item balancing 2018-10-26 00:00:25 -04:00
VizardAlpha
103b8cd13a Rename bundle_fr_be.properties to bundle_fr_BE.properties (#271) 
Update Bundle
 2018-10-25 12:16:04 -04:00
xgamezs
15ce31ea3a Adding a new string (#270) 
* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Create bundle_fr_be.properties

* Delete bundle_fr_be.properties

* Create bundle_fr_be.properties

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Create bundle_tr.properties

* Update bundle_tr.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

* Update bundle.properties

* Update bundle_uk_UA.properties (POEditor.com)
 2018-10-24 18:38:51 -04:00
Anuken
8b8c74cf93 Added filename entry (again) 2018-10-24 13:26:32 -04:00
xgamezs
cc43524b4c Update and standardize translations (POEditor.com) (#258) 
* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Create bundle_fr_be.properties

* Delete bundle_fr_be.properties

* Create bundle_fr_be.properties

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Create bundle_tr.properties

* Update bundle_tr.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)
 2018-10-24 13:22:18 -04:00
Anuken
f87d297155 Added filename entry 2018-10-24 13:09:42 -04:00
Anuken
de6681d00a Added special case for unit.none 2018-10-24 10:31:23 -04:00
VizardAlpha
c38f866363 Updates bundle_fr_be.properties (#260) 
Replacing the new translations. Translation finish
 2018-10-23 09:01:46 -04:00
CinExPL
511b112ac7 Update bundle_pl.properties (#257) 2018-10-23 09:01:04 -04:00
키에르
412d92e782 Update bundle_ko.properties (#255) 2018-10-20 09:33:43 -04:00
Niko
c0703a6a5e Add german translations (#256) 
* Replace some English Text with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some English Text about Units and Fluids with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some mech and drone definitions with german translations in bundle_de

* Replace almost all definitions with german translations in bundle_de

* Merge branch 'master' into add_german_translations

# Conflicts:
#	core/assets/bundles/bundle_de.properties

* fix some typos in bundle_de
 2018-10-20 09:33:35 -04:00
Anuken
01ceedccd5 Updated bundles / Decreased water extractor power usage 2018-10-19 09:32:23 -04:00
Anuken
ed28af7c73 Changed 'max power' to 'base power', re-scaled display stats of fuel 2018-10-19 09:31:33 -04:00
Anuken
d68d2e9f30 Moved paused text details into bundle 2018-10-18 22:33:11 -04:00
Baramos666
fd7b829e70 Update bundle_fr.properties (#249) 2018-10-18 21:56:44 -04:00
LQ
87a7cc6289 add liquid out speed display (#250) 2018-10-18 21:56:35 -04:00
VizardAlpha
2f8b5e53bb Updates bundle_fr_be.properties (#251) 
Recast of the French translation (Belgium)
 2018-10-18 21:56:09 -04:00
Prosta4okua
8b7fa3b646 [WIP]Update bundle_ru.properties (#243) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-10-18 21:56:00 -04:00
Anuken
5e5838a8c1 let me make this PAINFULLY CLEAR 2018-10-18 16:04:40 -04:00
Skybbles // L5474
0fffbc06dd Spelling correction (#252) 
*maybe you mean CLI board.*
 2018-10-18 14:35:33 -04:00
Anuken
4d360bfb73 Bugfixes 2018-10-18 09:19:29 -04:00
Anuken
6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken
f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken
8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken
81ce12a38c Added random PvP/Waves map generation 2018-10-14 13:24:32 -04:00
Anuken
f670d522bf PvP merge 2018-10-14 10:01:50 -04:00
VizardAlpha
31b39231a2 Updates bundle_fr_be.properties (#242) 2018-10-13 23:32:08 -04:00
Anuken
4eb2c1f646 PvP autohost 2018-10-13 23:30:05 -04:00
Anuken
5f89d8588d Added 'abandon sector' button 2018-10-13 23:07:57 -04:00
Anuken
0aabc09b82 Made game-overs remote events 2018-10-13 21:58:17 -04:00
Anuken
870f5caca9 PvP game over condition 2018-10-13 17:33:23 -04:00
Anuken
28b4ddfc72 PvP game over condition and message 2018-10-13 17:31:38 -04:00
Prosta4okua
13a4a26e97 Update bundle_ru.properties (#241) 2018-10-13 17:29:09 -04:00
Anuken
81c7e63994 Added 'waiting for players' message 2018-10-13 16:03:21 -04:00
Anuken
f8d0682810 Added warnings for missing enemy cores 2018-10-13 15:49:18 -04:00
Anuken
1cd8e8a097 Improved server discovery 2018-10-13 12:21:11 -04:00
Anuken
3688dde5e5 Merged mobile mechs 2018-10-13 10:52:48 -04:00
Anuken
ae6a5b2512 Made PvP a selectable mode 2018-10-13 10:50:22 -04:00
Anuken
8bda5e16cd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_fr.properties
 2018-10-13 08:59:15 -04:00
Anuken
d70d3d95f0 Bundles updated 2018-10-13 08:58:41 -04:00
Baramos666
554b7d2ec4 Update bundle_fr.properties (#239) 2018-10-13 08:58:04 -04:00
Baramos666
18020d64cc Update bundle_fr.properties (#234) 2018-10-11 22:58:05 -04:00
Anuken
5f1bc6c6c2 Custom spawn locations 2018-10-10 13:02:00 -04:00
Anuken
38f2f1e30a Added legacy map importer 2018-10-09 22:52:28 -04:00
Anuken
4792828da1 Missions now displayed as number / Improved mission gen 2018-10-09 09:22:06 -04:00
VizardAlpha
9566155bdb Created bundle_fr_be.properties (#233) 
For Belgian player
 2018-10-08 14:14:16 -04:00
Anuken
c1d9dee46c Added content mission / Working implementation of preset sectors 2018-10-07 19:21:53 -03:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
14e0b471d3 Mobile mechs implemented 2018-10-05 22:58:46 -04:00
Anuken
ed0df64cf9 Fixed compile errors / Refactored sector presets 2018-10-05 22:16:40 -04:00
Anuken
35bc2c9803 Sector preset class / New missions 2018-10-05 16:36:50 -04:00
Anuken
d2ce051c4a Implemented Fortress unit / Made artillery ignore air 2018-10-01 09:51:12 -04:00
Anuken
d5d90bde9a Removed mech ability key 2018-09-30 19:22:19 -04:00
Anuken
b43c542213 Auto-target configuration 2018-09-29 20:49:19 -04:00
Anuken
e7533232c0 Fixed custom game waves / Fixed Windows appdata being incorrect 2018-09-29 14:25:29 -11:00
Anuken
d062dffc13 Cleanup / Fixed unlock system in custom games 2018-09-29 02:50:21 -07:00
Jae
24decf8abc Update bundle_zh_CN.properties (#230) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties

* Added zh_CN translations

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2018-09-27 17:46:17 -04:00
DinoWattz
db3dac261a Update bundle_pt_BR.properties (#231) 
Fixed some words and translated some words
 2018-09-27 13:09:09 -04:00
Jae
720e1a038e French translations added (#228) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties
 2018-09-26 13:42:20 -04:00
Baramos666
1753c54e88 Update bundle_fr.properties (#229) 2018-09-26 13:28:18 -04:00
Anuken
554d9b4047 Updated bundles 2018-09-25 16:41:18 -04:00
Prosta4okua
02d565ce58 [COMPLETE]Rare update bundle_ru.properties (#223) 
* Update bundle_ru.properties

Added the same thing as in bundle.properties. Also added 9 descriptions. Because of this PL, a PL from xga is old.

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-09-25 16:39:52 -04:00
Anuken
d5bb1b72b9 Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2018-09-24 22:57:49 -04:00
Anuken
af86564adc Final tutorial fixes 2018-09-24 22:56:48 -04:00
Anuken
5354e02b6f Finally a somewhat functional tutorial / Many bugfixes 2018-09-24 20:24:51 -04:00
Prosta4okua
4ee17a656f Update bundle.properties (#226) 2018-09-24 14:14:23 -04:00
Anuken
20732f04ff Block position starting missions 2018-09-23 23:45:35 -04:00