mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 04:59:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
4,778 Commits 4 Branches 160 Tags 2.3 GiB
532926a9e3
Commit Graph

4089 Commits

Author SHA1 Message Date
Anuken
532926a9e3 Mod reloading that works for some ridiculous reason? 2019-10-02 23:09:35 -04:00
Anuken
89db08f4ed Fixed unit tests, server 2019-10-02 21:29:35 -04:00
Anuken
ffd4297b17 Mod corruption load warnings 2019-10-02 21:23:29 -04:00
Anuken
ec29bd3682 Custom sounds, mod sound loading 2019-10-02 21:03:56 -04:00
Anuken
76dbc1cca3 Fixed ore/editor icon generation 2019-10-02 20:25:33 -04:00
Anuken
e0ec9a047c Modded consumers 2019-10-02 14:44:18 -04:00
Anuken
7dfe2116fe
Update Logic.java 2019-10-02 09:57:17 -04:00
Anuken
525360f284
Update Control.java 2019-10-02 09:56:31 -04:00
Anuken
2db3060a03 Made content icon system more sane 2019-10-01 23:46:40 -04:00
Anuken
d9b8335e0e Block tech tree mods 2019-10-01 21:47:02 -04:00
Anuken
5b8c237a1e Modding improvements 2019-10-01 21:33:51 -04:00
Anuken
8ccdba5be2 Disabled Player-Player and Player-Drone collisions 2019-10-01 20:28:40 -04:00
Anuken
cb929a7239 Merge remote-tracking branch 'origin/master' 2019-10-01 17:35:30 -04:00
Anuken
251b8deb25 Fixed steam crash with a workaround 2019-10-01 17:35:23 -04:00
Anuken
9145ade617 Changed host confirmation text 2019-10-01 12:40:43 -04:00
Anuken
4b83569b43 Switched consumers over to dynamic Bits 2019-10-01 12:15:50 -04:00
Miguel de Dios Matias
56cc806d01 Fixed the spanish translation 'silicona' -> 'silicio'. (#758) 2019-10-01 11:55:31 -04:00
Anuken
4bc37ab065 Some minor queued block fixes 2019-09-30 22:12:02 -04:00
Anuken
c9e969c7b4 Editor scroll fix 2019-09-30 21:45:25 -04:00
Anuken
65290dc2bf Merge branches 'config-int' and 'master' of https://github.com/Anuken/Mindustry 2019-09-30 21:35:07 -04:00
Anuken
8c3f8f9b01 Fixed connection glitch 2019-09-30 21:34:50 -04:00
Anuken
985918b870 Fixed power node config 2019-09-30 21:08:56 -04:00
Anuken
62ad78ace9 Saving of broken blocks 2019-09-30 20:48:02 -04:00
Anuken
7bfdbaabe7 Int configuration / Drone rebuilding 2019-09-30 19:40:08 -04:00
cheese1
4f2bfb2406 Update bundle_de.properties (#752) 2019-09-30 17:42:31 -04:00
Anuken
3b5dd7567a Allow mods to add maps 2019-09-30 17:24:51 -04:00
Anuken
94733515e4 Reduced spirit factory to 1 drone, 2x power 2019-09-30 17:12:08 -04:00
Anuken
a2474e71cc
Zone mod parsing 2019-09-30 12:18:43 -04:00
Anuken
c361f692df
Update Zone.java 2019-09-30 12:11:23 -04:00
Anuken
758670eb51
Update InputHandler.java 2019-09-30 10:57:48 -04:00
Anuken
c8b12837a4
Update MenuFragment.java 2019-09-30 10:25:49 -04:00
Anuken
f7f854f0d3
Update MenuFragment.java 2019-09-30 10:17:08 -04:00
Anuken
8c27108b0a
Update CrashSender.java 2019-09-30 10:15:27 -04:00
Anuken
7cd220fe8c Display more launch info / Store mod list in saves 2019-09-29 23:40:23 -04:00
Anuken
7fccd18910 Server mod checking 2019-09-29 22:59:23 -04:00
Anuken
73e9f55e55 More tutorial info 2019-09-29 21:51:45 -04:00
Anuken
002a052371 Fixed #748 / Better mod loading 2019-09-29 21:41:32 -04:00
Anuken
0049a0004e Block rotation / Mod loading improvements 2019-09-29 19:54:52 -04:00
Anuken
b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties
 2019-09-29 17:03:28 -04:00
Anuken
429bb6ac13 plugins -> mods 2019-09-29 16:52:17 -04:00
Anuken
33416aadef Parsing fixes / Moved annotations to Arc 2019-09-29 16:09:43 -04:00
Anuken
f17e46015a JSON block, item loading 2019-09-29 15:21:50 -04:00
Prosta4okua
2b8878e724 Ukrainian language (#715) 
* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

* gmmm

/-/-/-/

* idk what i changed

* Обновление и корректировка строк с 1 по 90

* router

* Обновление и корректировка строк с 87 по 252

Обновление и корректировка строк с 87 по 252, а так же правка предыдущих.
- 35 строку лучше привести в соответствии с оригинальным текстом, без дополнений и пояснений.
- 103 строка не переводится в соответствии с https://semver.org/lang/ru/ , хотя это не жёсткое правило, поскольку не влияет непосредственно на алгоритм работы с версиями.
- 187 Предлагаю эту строку перевести как 'Настройки карты', не смотря на оригинальный текст (соответственно и 230, 231).

* router

* Create description.txt

* Update description.txt

* Create short-description.txt

* Create achievements.vdf

* Update achievements.vdf

* Update bundle_uk_UA.properties

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* 000b23d703
^
 2019-09-29 12:53:52 -04:00
Anuken
63744c0a3a 'belts' 2019-09-29 12:39:59 -04:00
Anuken
9c175ac893 Type parsing work 2019-09-29 12:36:01 -04:00
Anuken
c6bc398950 Texture packing 2019-09-29 11:26:25 -04:00
Anuken
d35fbb8383 bugfixes 2019-09-29 08:59:53 -04:00
Anuken
fe3f75f141 Starting work on json content parsing 2019-09-28 23:58:30 -04:00
Anuken
79554bf8e9 Mod import/export dialog, restarting 2019-09-28 23:26:55 -04:00
Anuken
4f9ed73a59 Added mod file tree, bundle loading 2019-09-28 21:13:44 -04:00