mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,505 Commits 4 Branches 160 Tags 2.1 GiB
ddb6e74955
Commit Graph

2157 Commits

Author SHA1 Message Date
Anuken
ddb6e74955 Fixed revenant never shooting 2018-10-26 00:09:09 -04:00
Anuken
2094bc3d80 Renamed phase matter to reduce conflicts / Item balancing 2018-10-26 00:00:25 -04:00
Anuken
c922007d21 Removed unnecessary manual font specification 2018-10-25 23:22:37 -04:00
Anuken
b1435c1264 Merge remote-tracking branch 'origin/master' 2018-10-25 23:21:31 -04:00
Anuken
be5e1648e0 Removed font line height tweak 2018-10-25 23:21:27 -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
Anuken
e6dd36283d Misc. bugfixes 2018-10-24 20:21:48 -04:00
Anuken
fda1d4cc2b Merge remote-tracking branch 'origin/master' 2018-10-24 18:53:09 -04:00
Anuken
5be92460c1 Fixed crash 2018-10-24 18:53:05 -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
35e5a669a0 Fixed mobile mining/targeting conflict 2018-10-24 14:03:48 -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
키에르
2294b6babb Add more texts with Cyrillic (#262) 2018-10-23 09:23:19 -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
Anuken
8cd0618e85 Fixed crash 2018-10-23 08:41:52 -04:00
Anuken
b4b589bfc2 Removed unnecessary synchronization 2018-10-22 22:48:15 -04:00
Baltazár Radics
cb69eb7c0f Simplified power logic (#261) 
* Simplified power logic

* Made the requested changes
 2018-10-22 22:47:44 -04:00
Anuken
7d83cd89f2 Fixed breaking with multiblock being offseted 2018-10-22 22:21:22 -04:00
Anuken
b2dca0a34f Merge branch 'optimizations' of https://github.com/Anuken/Mindustry 2018-10-21 21:50:14 -04:00
Anuken
3bd73961d7 Merged inventory saving/loading, item-based capacity 2018-10-21 21:46:12 -04:00
Anuken
67f574b5d8 Storage graph inventory sharing 2018-10-21 19:49:32 -04:00
Anuken
f9b70a37aa Correct storage graphs 2018-10-21 17:20:08 -04:00
Anuken
d4047e1413 Fixed crash 2018-10-21 17:03:51 -04:00
Anuken
80f5b4c3b7 Crashy storage graph implementation 2018-10-21 17:02:37 -04:00
Anuken
4668a6d8c0 Implemented sector state network sync 2018-10-20 18:41:05 -04:00
Anuken
e6f076306f Merge branch 'rework-sectors' of https://github.com/Anuken/Mindustry 2018-10-20 17:36:56 -04:00
Anuken
b73dc127a3 Fixed enemy base generation 2018-10-20 17:36:07 -04:00
Anuken
8c8a2311d6 Fixed sector clear not resetting 0,0 2018-10-20 16:04:13 -04:00
Anuken
0555fb22ca Fixed pump crash 2018-10-20 14:09:00 -04:00
Anuken
85cde62039 Fixed phase weaver blink / Fixed item image offset (again) 2018-10-20 13:53:25 -04:00
Anuken
46a2648d15 Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:50:30 -04:00
Anuken
e55f6ecd6b Fixes to power system 2018-10-20 13:49:58 -04:00
Anuken
c71fee3fed Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:21:05 -04:00
Anuken
4d6c25c9d3 Fixed flying units blocking construction 2018-10-20 13:20:35 -04:00
Anuken
6ed4e2d946 Improved random recipe selection 2018-10-20 13:19:47 -04:00
Anuken
6b4242478f Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 11:52:02 -04:00
Anuken
ef5478279b Fixed 2 crashes 2018-10-20 11:48:59 -04:00
Anuken
62bb8bce1c Added missing imports 2018-10-20 11:44:19 -04:00
Anuken
f78abd61d4 Merge remote-tracking branch 'origin/master' 2018-10-20 11:39:05 -04:00
Anuken
209c6fa1c1 Merged in better multithreading 2018-10-20 11:39:00 -04:00
Anuken
6e3c600a49 Crash fix 2018-10-20 11:36:05 -04:00
Anuken
b1cda57174 Massively improved thread safety 2018-10-20 11:25:58 -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
6be49f898c Removed onFirstBegin() 2018-10-19 23:20:04 -04:00
Anuken
59bc73656f Save file refactor / Changed sector size 2018-10-19 22:46:53 -04:00