Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,877 Commits 4 Branches 180 Tags
ce0a8de25b76a7b99800a83da96203b3a829f714
Commit Graph

3441 Commits

Author SHA1 Message Date
Github Actions
cf9a7f0c63 Automatic bundle update 2022-07-31 01:03:28 +00:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
RTOmega
a3bdcd175b TR Bundle Cleanup (#7229) 2022-07-28 15:38:16 -04:00
Github Actions
b55465a4b0 Automatic bundle update 2022-07-28 14:22:45 +00:00
SoMall-dumpling
a263aa781d Update bundle_zh_CN.properties (#7189) 
* Update bundle_zh_CN.properties

The following updates will focus on better unit names, turret names, map names, and other untranslated stuff.

* Update bundle_zh_CN.properties

four new lines

* Update bundle_zh_CN.properties

Revert rollback, and some missing translations.

* Update bundle_zh_CN.properties

map names

* Update bundle_zh_CN.properties

turret names, arkycite-related translations

* Update bundle_zh_CN.properties

boulders

* 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

这个\n的位置我实在看不下去了

* Create bundle_zh_CN.properties

恶灵->魔灵

* Update bundle_zh_CN.properties

奇奇怪怪多出来个\n

* 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

two new lines

* Update bundle_zh_CN.properties

还是改回来。事实上墙的描述是挡下敌方炮弹，但也挡不住抛射炮。所以没有太大必要改前面的东西。（而且shell也是炮弹的意思）
死神，太逊啦

* 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-07-28 10:21:38 -04:00
Catchears
224cc80b59 update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -04:00
Github Actions
43f7384855 Automatic bundle update 2022-07-22 18:00:35 +00:00
RTOmega
9a3a6c31b3 Adding Block: Heat Source (#6855) 
* Update Blocks.java

* ,

* Update Blocks.java

* Add files via upload

* Delete 5618F7BA-F0D0-4FFF-AE6A-185BFEA99F16.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update Blocks.java

* Bundle

* 1m to 10k

* Update bundle.properties

* TR

* 10k to 1k

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-22 13:59:32 -04:00
Github Actions
b94393f150 Automatic bundle update 2022-07-19 02:16:10 +00:00
Anuken
a6ae178b46 Misc minor fixes 2022-07-18 22:14:53 -04:00
Github Actions
32871920b2 Automatic bundle update 2022-07-18 00:36:56 +00:00
Anuken
494440a591 Fixed incorrect 'command mode' hint on mobile 2022-07-17 20:35:49 -04:00
Github Actions
ffff3fa351 Automatic bundle update 2022-07-17 13:22:44 +00:00
Lucky Clover
93f12a5544 Update bundle_zh_CN.properties (#7135) 
* Update bundle_zh_CN.properties

* 部分补充

* 光彩统一改成光效

* Update bundle_zh_CN.properties

Thanks @SoMall-dumpling for review

* Suggestions from @xem8k5, @Cry0flu1d and more

* thanks mi2/xerxer

* miner fix

* Corrections from SoMall-dumpling

* Update suggestions from  @nanmenyangde

* liquid翻译讨论确定：液体->流体

* from @nanmenyangde

* suggestion from @SoMall-dumpling & @BlackDeluxeCat
 2022-07-17 09:21:53 -04:00
Github Actions
4ac7254842 Automatic bundle update 2022-07-16 15:32:30 +00:00
ThatOneBepis
4c80cf90cc Update bundle_sr.properties (#7181) 2022-07-16 11:31:35 -04:00
Anuken
830a771a90 Merge remote-tracking branch 'origin/master' 2022-07-15 19:28:40 -04:00
Anuken
2ec1f9f55d typo 2022-07-15 19:28:35 -04:00
Github Actions
2e7dca06ed Automatic bundle update 2022-07-15 23:27:34 +00:00
Anuken
8d6cac39d0 Fixed #7178 / Maps renamed 2022-07-15 19:26:23 -04:00
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
GlennFolker
695c19d0b0 Tree-like objective node structure (#7152) 
* overall structure

* overall layout

* field interpreter

* less bloated UI

* scroll pan't

* strip off the 'Marker' suffix

* e

* all (hopefully all...) interpreters finished.

* onset

* two, four

* i don't understand how icon mappings work.

* separate remover and indexer

* some cleanups

* untested mobile support

* contrib

* ok anuke

* fix conflicts 2

* hidden
 2022-07-15 10:41:18 -04:00
BetaEridani
d72d663219 Update bundle_fi.properties (#7164) 
Swapped the places of two text lines to correct a mistake.
 2022-07-14 23:37:14 -04:00
Github Actions
bb7f96437c Automatic bundle update 2022-07-15 03:34:36 +00:00
Catchears
e4274c2b49 german erekir & v7 translation (#6869) 
* initial german erekir translation

* first ideas

* Update bundle_de.properties

added missing ones, fixed some typos

* Update bundle_de.properties

* Update bundle_de.properties

* suggested changes

* shawak's changes

* update to 4c3ee57ce9

* update to 3927841f43

* update to 371394df6f

* update to d6539b267c

Co-authored-by: JoeFLYtheCoder <73280709+jdopss@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-14 23:33:26 -04:00
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Epowerj
6aa9623512 Added a temporary description for four 2022-07-14 15:44:32 -04:00
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Anuken
72b36d97bd RTS max squad size 2022-07-11 18:18:22 -04:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
7aea85668b forgot period lol 2022-07-11 17:15:11 -04:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Epowerj
735d81e42b Typo 2022-07-11 17:03:55 -04:00
Epowerj
4746cdbb6b Added description to atlas 2022-07-11 17:02:22 -04:00
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Anuken
c9f24692c5 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-07-11 14:38:00 -04:00
Anuken
411b6d7460 Shockwave tower block 2022-07-11 14:37:57 -04:00
BetaEridani
49122729af Update bundle_fi.properties (#7163) 
Fixed some minor typos + translated names of the two new turrets.
 2022-07-11 06:44:58 -04:00
Github Actions
28aad7313e Automatic bundle update 2022-07-10 14:14:47 +00:00
BetaEridani
6b542ef494 Update bundle_fi.properties (#7142) 
Translated bundle_fi.properties entirely to finnish. Also fixed some grammar.
 2022-07-10 10:13:38 -04:00
Github Actions
4bc0ce9338 Automatic bundle update 2022-07-09 20:32:32 +00:00
Jerzozwierz
1e7bd3e8f4 Big update to bundle_pl (#7159) 
Big changes to bundle_pl. Huge cleanup. The changes were consulted with translators such as Somka HybridDeathPrime. They had no objections. Polish chat had no objections. All changes were made mainly by me, ۲▁⊕ᶬṉ๏൩⁷ ©, pożeracz cukierków#2648, p0gn'1_#1415, [PL] Stalker TurTur#7069.
 2022-07-09 16:31:18 -04:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Anuken
311118ae58 Hastily implemented final endgame turret 2022-07-09 00:33:15 -04:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Epowerj
c2a9c77510 Added a sector description for three 2022-07-07 16:57:12 -04:00
Github Actions
42cd5ee12e Automatic bundle update 2022-07-07 02:10:21 +00:00