mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-31 18:04:21 +07:00
Code Issues Packages Projects Releases Wiki Activity
14,677 Commits 4 Branches 160 Tags 2.3 GiB
f880843dfd
Commit Graph

3378 Commits

Author SHA1 Message Date
Github Actions
4c3ee57ce9 Automatic bundle update 2022-06-16 19:38:22 +00:00
Angel-24
355ad39a7e
[ES] bundle_es.properties quality fixes (#6868) 
* Update bundle_es.properties

* Update contributors

* Update bundle_es.properties

* "Plano"/"Plantilla" → "Esquema"

* Improved "splash damage" string

* Plasma bore → "Perforador de plasma"

* World processor → "Procesador integrado"

The "world processor" and "world memory cell" are blocks initially placed as a part of the map. Using the word "integrado" instead of "global" fits better for these blocks, indicating that this block is built within the map by default.

* Update bundle_es.properties

Enable Console, VSync, and audio volume options.
 2022-06-16 15:37:19 -04:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
Anuken
2109a25e3e Turret progress 2022-06-16 15:34:22 -04:00
xem8k5
d3e5a139e3
Update bundle_zh_CN.properties (#7017) 2022-06-14 22:40:22 -04:00
Somka000
33cd7c0bf4
Update (#7004) 2022-06-14 10:26:31 -04:00
First Creator
c1317a787d
(update bundle_fil.properties) when will anuken merge this lol (#6992) 
* we goin perhaps

UwU~

* more i guess

* Update bundle_fil.properties
 2022-06-14 08:27:52 -04:00
Github Actions
472da6f1b5 Automatic bundle update 2022-06-14 12:20:04 +00:00
Tegas Aziz
1469b96db7
[ID] Bundle updates (#7015) 
* [ID[ Bundle updates

* unicode on initerror
 2022-06-14 08:18:42 -04:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Ilya246
dc5b184d45
Add a solar panel output multiplier (#7013) 
* do

* world processor compatibility

* useless
 2022-06-13 21:09:06 -04:00
Anuken
1a63a2726e well, that didn't work. 2022-06-12 13:22:54 -04:00
xem8k5
2c197aae7c
Update bundle_zh_CN.properties again (#7001) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-06-11 08:17:10 -04:00
Anuken
8d27d70bc2 Merge remote-tracking branch 'origin/master' 2022-06-10 08:34:43 -04:00
Anuken
8418a00483 Misc bugfixes 2022-06-10 08:34:38 -04:00
Github Actions
0a96aedc22 Automatic bundle update 2022-06-09 18:34:03 +00:00
Jerzozwierz
e9bf756165
Update pl (#6853) 
Some changes in translation so it sounds better, also few things translated

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:33:07 -04:00
Github Actions
856a4dd218 Automatic bundle update 2022-06-09 18:31:39 +00:00
彭瑞暄
a618782345
Update zh-TW bundle translations (#6877) 
* formatting and minor changes

* Corrections

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

Clean-up logic-op translations

Co-authored-by: Simba-Fs 陳宏彰 <39305460+simba-fs@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-09 14:30:43 -04:00
Thomas Widyantoko
fb6e44d9e4
another v7 id_ID bundle update (#6837) 
* another v7 id_ID bundle update

Untranslated strings at line 1744-1754 and 2000-2003. Ambiguous strings at line 1170 and 1638. Fixed several typos, capitalizations and word choices.

* more id_ID v7 translation

untranslated strings at line 1744-1754
line 1942, Grafitik -> Grafit
line 1995-1997 erekir cores
 2022-06-09 14:30:03 -04:00
Github Actions
a18af7de64 Automatic bundle update 2022-06-08 15:20:55 +00:00
KayAyeAre
4646db8194
thai translation for v7 (#6927) 
* translations part 1

* translations part 2
 2022-06-08 11:18:49 -04:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Anuken
13ac6e0331 Made console a setting 2022-06-08 10:35:00 -04:00
Anuken
c969749163 Fixed #6898 2022-06-08 09:43:42 -04:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
BlueWolf
38b0a664f4
so i made a slag heater (#6925) 
* Add slag fueled heater

* i have no idea why i have to do this but i do

Co-authored-by: Blue <415bluewolf@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:20:35 -04:00
Github Actions
bcbfde106d Automatic bundle update 2022-06-08 13:09:24 +00:00
Nunting
d3924dc0ae
Update bundle_ko.properties (#6848) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-06-08 09:08:28 -04:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Anuken
0793ba45b5 Merge remote-tracking branch 'origin/master' 2022-06-08 09:05:31 -04:00
Anuken
b2353eba58 Misc 2022-06-08 09:05:25 -04:00
ErrorInCode
49c9841c87
Add Reinforced Surge Wall Names (#6873) 
* Added Reinforced Surge Wall Names

* i am not worthy
 2022-06-08 09:05:12 -04:00
Github Actions
91643d94c4 Automatic bundle update 2022-06-08 12:58:35 +00:00
Cryofluid
b9297a83b0
reconstructor -> refabricator (#6924) 2022-06-08 08:57:42 -04:00
MEEPofFaith
4e2b555813
Misleading description fix (#6880) 2022-06-08 08:40:37 -04:00
Yuri Polyakov
1d8d0f4a36
[RU] Big bundle update (#6849) 
* [RU] Big bundle update

r.i.p. my last pr

* Update bundle_ru.properties

* роутер
 2022-05-12 11:26:42 -04:00
澄みわたる朝色
fb8434322c
Update bundle_zh_TW.properties (#6851) 
* zh_TW translation for erekir

* zh_TW translation for erekir

* zh_TW translation for erekir

* zh_TW translation for erekir

Co-authored-by: weiliang1503 <weiliang1503@163.com>
 2022-05-12 10:51:02 -04:00
Anuken
e83e402612 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:19:14 -04:00
Github Actions
48b19751a3 Automatic bundle update 2022-05-12 04:07:42 +00:00
Anuken
9b9a1dd332 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-12 00:06:55 -04:00
xem8k5
699a8929e4
Fix bundle_zh_CN.properties (#6844) 
* Fix bundle_zh_CN.properties

block.tank-refabricator.name = 坦克重构厂
block.mech-refabricator.name = 爬虫重构厂
block.ship-refabricator.name = 飞艇重构厂

Now is "refabricator"？

* Update bundle_zh_CN.properties
 2022-05-12 00:06:47 -04:00
Somka000
1944ffe1a5
Translated everything bundle_pl.properties (#6838) 2022-05-11 21:57:26 -04:00
Github Actions
eff4e91207 Automatic bundle update 2022-05-11 23:28:53 +00:00
xem8k5
37a46282f2
Update bundle_zh_CN.properties the third time (#6834) 
* Update bundle_zh_CN.properties the third time

Fixed various grammar issues

* Update bundle_zh_CN.properties
 2022-05-11 19:27:58 -04:00
Anuken
c1e98a1406 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-11 14:40:39 -04:00
Anuken
be9b7da892 Automatic consumeCoolant 2022-05-11 14:36:34 -04:00
Rex
2da60c4efc
Update bundle_es.properties (#6826) 
I just realized that they are turrets and not blocks
 2022-05-11 14:04:32 -04:00
Github Actions
4ac87ec61a Automatic bundle update 2022-05-11 14:15:24 +00:00
Rex
beae0662ce
Update bundle_es.properties (#6825) 2022-05-11 10:14:12 -04:00
snusunny
72f4d67a3b
[KO] Fix incorrect translations (#6823) 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- Fixed condensers being translated into *electric* condensers
- Fixed incorrect core names
- Made team names (derelict, sharded, crux ectc.) be proper nouns (고유명사) like you asked
- Fixed blast doors being translated as blast *compound* doors
- some other small fixes
 2022-05-11 10:02:00 -04:00
Anuken
aa3bf50731 Merge remote-tracking branch 'origin/master' 2022-05-10 21:56:41 -04:00
Anuken
8c98f8f9bf Mass driver reloadTime -> reload 2022-05-10 21:56:34 -04:00
Somka000
64e5561b5a
Translate things from Erekir and some other (#6812) 2022-05-10 21:16:32 -04:00
Anuken
2e4037451f Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 21:07:48 -04:00
Yuri Polyakov
99f98cc761
Update bundle_ru.properties (#6760) 
* Update bundle_ru.properties

* Update bundle_ru.properties

упс

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 21:07:33 -04:00
Yuri Polyakov
05cbc8a477
Update bundle_ru.properties (#6762) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2022-05-10 21:07:13 -04:00
Github Actions
05578fe8b7 Automatic bundle update 2022-05-10 23:02:41 +00:00
Anuken
6bda5546a6 Merge branch 'erekir' of https://github.com/Anuken/Mindustry 2022-05-10 19:01:40 -04:00
Anuken
0c6c9620a7 lang 2022-05-10 19:01:33 -04:00
end-me-please
9b8a09892a
Update bundle_de.properties (#6768) 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04:00
Github Actions
fbf70224e4 Automatic bundle update 2022-05-10 22:58:02 +00:00
Nunting
3db6637e9f
Update bundle_ko.properties (#6763) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-05-10 18:56:56 -04:00
Anuken
a089afc626 Merge branch 'master' of https://github.com/Anuken/Mindustry into erekir 
 Conflicts:
	core/assets/bundles/bundle_zh_TW.properties
 2022-05-10 18:15:43 -04:00
xem8k5
db947d33ca
Update bundle_zh_CN.properties twice (#6802) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-05-09 20:06:23 -04:00
Anuken
aa1abeb4be Typo fixes 2022-05-09 19:55:51 -04:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Anuken
31c5ef2dc5 Some world processor documentation 2022-05-09 17:41:42 -04:00
xem8k5
f16119cd0f
Update bundle_zh_CN.properties (#6759) 
* Translation zh_cn partly

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

发觉强化不符合题意，普通容器血量220 容量300，“强化”容器血量480 容量250，反向强化是不是？故固化符合题意
 2022-05-08 21:28:20 -04:00
Github Actions
e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00:00
Anuken
d28a839f55 RTS unit control improvements/fixes 2022-05-08 12:45:48 -04:00
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Anuken
396363c11d Replaced stats entries to assist translation changes 2022-05-08 09:29:10 -04:00
Goobrr
0f3780dbb2
GameOverDialog rework (#6783) 
* GameOverDialog rework

* cleanup
 2022-05-08 09:26:49 -04:00
Github Actions
a3ef2a6185 Automatic bundle update 2022-05-07 17:40:26 +00:00
RTOmega
86161ffa4c
TR Bundle Update (v7) (#6767) 
* until 574

* TR Bundle Update (v7)
 2022-05-07 13:39:42 -04:00
彭瑞暄
ed40127539
Updated bundle_zh_TW translations (#6754) 
* Update bundle_zh_TW.properties

Translation polish, changed unit from "千" to "K", updated naval support uints.

* Update bundle_zh_TW.properties

Another round of polishing.
 2022-05-07 13:21:03 -04:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Anuken
aa0e254f0e Mobile unit command support 2022-05-07 00:30:25 -04:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
Anuken
a2af906f1a Fab cost fix 2022-05-06 18:43:59 -04:00
Anuken
0c1926ade6 Block renaming done 2022-05-06 14:35:06 -04:00
Anuken
f7175540f8 Disable world processor rule 2022-05-05 20:36:11 -04:00
Anuken
429e07adec More units renamed 2022-05-05 13:39:14 -04:00
Anuken
7782331dbc Unit renamings 2022-05-05 12:26:23 -04:00
Anuken
6a026f7286 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
 2022-05-05 00:31:49 -04:00
Anuken
8b9eb0b466 Cleanup 2022-05-03 15:27:30 -04:00
Anuken
068c0dbe4d Walker in tech tree 2022-05-02 17:51:40 -04:00
Anuken
3542bd9e90 T3 tank done 2022-05-02 15:37:43 -04:00
Anuken
a46cc17d38 Nuke cutscene 2022-04-28 22:05:46 -04:00
Anuken
6e04c70b16 Better nuke announcement 2022-04-28 19:57:21 -04:00
Anuken
9f501a33a3 Many misc bugfixes 2022-04-28 19:46:52 -04:00
Anuken
6c42dff884 Bugfixes 2022-04-28 18:25:39 -04:00
Anuken
c2452e2370 Misc 2022-04-28 17:34:18 -04:00
Anuken
7e665d376e Bugfixes 2022-04-28 17:09:34 -04:00
Epowerj
6d615bf641 Bundled nuclear launch text 2022-04-28 14:56:39 -04:00
Anuken
293311087d Fixed destroyblocks objective 2022-04-28 14:52:51 -04:00
Anuken
3d12b66f3c DestroyBlocksObjective 2022-04-27 16:37:38 -04:00
Anuken
aab6c3a9df Spawn wave instruction 2022-04-25 18:52:33 -04:00
Anuken
1ac7317986 Bloom config options 2022-04-25 10:53:18 -04:00