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
14,123 Commits 4 Branches 160 Tags 2.3 GiB
383beb3e8d
Commit Graph

3238 Commits

Author SHA1 Message Date
Anuke
d92c9cfcf8 Helix shoot pattern / Min mod game version 2022-03-05 19:05:42 -05:00
Otto Richter (fnetX)
6ea4570ae8
Update German translations (#6619) 2022-03-04 17:20:46 -05:00
ErrorInCode
ca016df40d
Fixed Phase Wall naming in Spanish (#6616) 
I removed the word "grande" from the name because that means big, and this is the smaller phase wall.
 2022-03-03 21:28:04 -05:00
router
96d99f68b2
Update bundle_cs.properties (#6615) 2022-03-03 09:24:29 -05:00
Anuken
c1bc97ec51 Removed BaseAI 2022-02-18 21:38:24 -05:00
Anuken
9633c57fe0 Erekir rule option 2022-02-18 18:06:33 -05:00
Anuken
aaba579314 Setup for RTS AI 2022-02-17 18:06:33 -05:00
Anuken
616e6664fc Cleanup & bugfixes 2022-02-16 13:07:28 -05:00
Anuken
427d43039b World play area rule 2022-02-16 12:45:48 -05:00
Anuken
49d5513c4e Special floors for cores 2022-02-16 11:00:18 -05:00
Anuken
95a0f4e735 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_fil.properties
 2022-02-14 23:34:54 -05:00
Anuken
3ebdb5309e Placement range check rule implemented 2022-02-13 21:02:33 -05:00
Anuken
f09e5afbe9 More logic message types 2022-02-12 18:50:15 -05:00
Github Actions
35ec122e2f Automatic bundle update 2022-02-12 14:27:18 +00:00
Dryehm
69737594cc
Filipino Bundle Translation (#6525) 
* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties

* Update bundle_fil.properties
 2022-02-12 09:26:11 -05:00
RebornTrack970
738e75253d
TR Bundle Fix (#6564) 
* TR Bundle Fix

* Update bundle_tr.properties
 2022-02-12 09:25:58 -05:00
Anuken
414d07a843 WIP map notification instruction 2022-02-10 11:49:55 -05:00
Anuken
a80e1d86a1 Logic-related color functions 2022-02-10 11:00:27 -05:00
Anuken
4278c057b4 Cleanup & control fixes 2022-02-09 19:58:08 -05:00
Anuken
3e0b8e9431 Custom rule for unit command 2022-02-09 17:28:51 -05:00
Anuken
fa79c5e93a Unit pathfinding 2022-02-09 17:13:02 -05:00
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
Anuken
d87ee0e942 conflict 2021-11-20 15:06:51 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Lin
aeaba6e111
Update bundle_zh_CN.properties (#6300) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2021-11-20 15:05:55 -05:00
Prosta4okua
0e8a677ecc
Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
Anuken
5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Yuri Polyakov
450f651c8f
Update bundle_ru.properties (#6267) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2021-11-01 09:32:57 -04:00
NgLam is SIMP
4cbc4a0bca
Update Vietnamese translation for V7 (#6246) 2021-11-01 09:31:34 -04:00
VizardAlpha
99e7fcd2d2
Update bundle_fr.properties (#6241) 
* Update bundle_fr.properties

After checking, there was some text missing to be translated.

* Minor modification
 2021-11-01 09:31:25 -04:00
Anuken
c4a5a9aec0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-29 11:44:43 -04:00
Fernando
c15f82297d
Update bundle_pt_BR.properties (#6127) 
* Update bundle_pt_BR.properties

Add missing translations

* Update contributors

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* h

* Update bundle_pt_BR.properties
 2021-10-27 14:39:30 -04:00
Catchears
15396b6032
update german translation (#6085) 
* update german translation to 30e6bb2625

* typo
 2021-10-27 11:38:03 -04:00
彭瑞暄
75a520c3ae
Update TW translations (#6092) 2021-10-27 11:36:13 -04:00
JrTRinny
d7fd7db3cc
Update bundle_th.properties (#6187) 
* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties

* Update bundle_th.properties
 2021-10-27 11:26:02 -04:00
Prosta4okua
144731bfb0
Update bundle_uk_UA.properties (#6213) 2021-10-27 11:25:48 -04:00
VizardAlpha
7c1d4a092e
Update bundle_fr.properties (#6227) 2021-10-27 11:25:37 -04:00
kituta
a28ece6424
Update bundle_ja.properties (#6232) 
Add. //追加
 2021-10-27 11:25:30 -04:00
RebornTrack970
39c5c6a6f0
TR Translation (#6239) 2021-10-27 11:25:19 -04:00
Sharlotte
77975a710c
Update bundle_ko.properties (#6185) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Skskskskskk
 2021-10-27 11:25:15 -04:00
Rex
d95dc98652
Update bundle_es.properties (#6238) 
* Update bundle_es.properties

please see #6226 too.

* Update bundle_es.properties
 2021-10-27 11:25:10 -04:00
Thomas Widyantoko
7afa6a7f44
Update bundle_in_ID.properties (#6240) 
i am speed
 2021-10-27 11:25:01 -04:00
Hexrotor
65ef189921
Corrected wrong zh_CN translation (#6224) 2021-10-27 09:32:08 -04:00
Lin
5b3b2cf4d5
Update bundle_zh_CN.properties (#6216) 2021-10-27 08:38:37 -04:00
Darkness#3729
d89184da43
[RU] Translation of save search & map search (#6219) 2021-10-26 10:46:29 -04:00
Anuken
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00