mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-26 06:27:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,496 Commits 4 Branches 160 Tags 2.3 GiB
54499e9c2c
Commit Graph

3167 Commits

Author SHA1 Message Date
Anuken
54499e9c2c Added editor playtest button 2022-02-08 01:40:12 -05:00
Anuken
6bbbd5ab01 Fixed disappearing blocks / Unit tech tree entries 2022-02-07 10:58:22 -05:00
Anuken
bf22b601f7 Slightly better core upgrade effect 2022-02-06 23:06:34 -05:00
Anuken
de96c8201d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-02-03 12:48:31 -05:00
Take
5c4f3171f7
Japanese translation (#5858) 
* translate sector name

* fix sector description translation

* fix translate: status

* fix translate: remove WIP from setting.coreitems.name

* correct a notation error between "ターレット" and "タレット"

* translate: link.bug, 研究タブ, network error, sectors.stored

* transalte: block name, use "放電" instead of "電撃アーク", scepter description

* fix translate: unmoving

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-02-02 16:57:02 -05:00
Anuken
3f8a7f591a Disabled Erekir invasions & planet simulation 2022-01-30 11:34:52 -05:00
Anuken
ac68edda40 Core launch capacity tweaks 2022-01-28 14:00:03 -05:00
Anuken
e4595b6831 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
 2022-01-27 14:58:44 -05:00
Anuken
121ae08240 New WIP sector preset 2022-01-26 00:13:43 -05:00
Anuken
9391c14ad4 Unit unbind control 2022-01-24 23:26:34 -05:00
Anuken
b79ed071b8 Correct erkir cloud color 2022-01-24 13:50:47 -05:00
Anuken
4a07c95e1c initialWaveSpacing rule 2022-01-24 13:34:55 -05:00
Anuken
4497f7ab3a Proper interplanetary launch 2022-01-23 14:37:08 -05:00
Anuken
48585274cf Onset sector 2022-01-22 16:43:36 -05:00
Anuken
fdcc373813 Editor experimental sector generator 2022-01-22 15:06:46 -05:00
Anuken
97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
Anuken
cfb01063c0 Misc map creation utilities 2022-01-21 16:32:35 -05:00
Anuken
698e89e796 Editor fixes 2022-01-19 22:23:50 -05:00
VizardAlpha
3311e40906
Update bundle_fr.properties (#6373) 
* Update bundle_fr.properties

* Removes -> Destroys..
 2022-01-17 23:18:41 -05:00
彭瑞暄
b8842a34ae
Update bundle_zh_TW.properties (#6470) 2022-01-17 21:58:26 -05:00
Anuken
10d8e63368 Multi-liquid sublimate 2022-01-10 14:01:30 -05:00
Anuken
acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
Anuken
677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
Anuken
4fbeae1afc Erekir tech sector requirements 2021-12-25 22:17:18 -05:00
Anuken
45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
Anuken
3866a9a8e7 the obligatory daily commit 2021-12-17 17:55:03 -05:00
Anuken
e481de9d28 Payload router sorter mode 2021-12-16 10:31:16 -05:00
KuhnChris
4b6541ae4e
Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) 
* Update settings file (bundle_de)

* Update bundle_de.properties
 2021-12-14 12:52:26 -05:00
Fancy2209
b5c1972040
Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) 
* Update bundle_pt_PT.properties

* Fix the other 2 words with -/ I didn't notice
 2021-12-13 13:20:30 -05:00
Anuken
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -05:00
Anuken
761ee12e6f LAccess.speed / Merged #6293 2021-12-10 00:36:47 -05:00
Anuken
8a2908374a Selectable tech tree 2021-12-08 21:57:10 -05:00
Anuken
acb4593390 Fill#rect bugfix 2021-12-08 19:39:44 -05:00
Matthew (or Maya) Peng
b70c08c2ec
Removes -> Destroys (#6409) 
* Removes -> Destroys

* inputed

* bad language design TM

english sucks
 2021-12-08 00:03:11 -05:00
Anuken
c8fb0c2e76 Liquids are fluids now 2021-12-03 22:28:05 -05:00
Anuken
9c9d147b95 TeamEntry class implementation 2021-12-03 10:28:34 -05:00
Anuken
b3dd7f4b8b WIP arkycite 2021-11-30 18:13:34 -05:00
Anuken
a24c15117d Cyanogen synthesis retexture 2021-11-27 12:17:45 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Catchears
c24c5c6196
update german translation (#6354) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-11-25 12:09:16 -05:00
KuhnChris
cd0fbb4d81
(german translation) add missing liquid-container (#6353) 
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
 2021-11-25 12:07:50 -05:00
Anuken
f7cf35369b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 13:17:36 -05:00
Build Uploader
42d931bff4 Automatic bundle update 2021-11-22 18:10:50 +00:00
Darkness#3729
4eb4c84b64
[RU] Update bundle (#6355) 
**Ban**dle
 2021-11-22 13:09:35 -05:00
Anuken
a0ba464de1 Fixed ja/zh unicode nonsense 2021-11-22 12:13:14 -05:00
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
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
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00