Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,649 Commits 4 Branches 180 Tags
bfdd7ecc3af821a50a471f4abeea049e167bfb44
Commit Graph
5937 Commits
Author SHA1 Message Date
Github Actions ffff3fa351 Automatic bundle update 2022-07-17 13:22:44 +00:00
Lucky CloverandGitHub 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
ThatOneBepisandGitHub 4c80cf90cc Update bundle_sr.properties (#7181) 2022-07-16 11:31:35 -04:00
Anuken d3210a0831 Misc minor fixes 2022-07-15 20:25:42 -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
Anuken f6093c864f Fixed map-3 waves 2022-07-15 18:57:01 -04:00
Anuken 9eacbb45d1 glenn what did you do 2022-07-15 17:14:57 -04:00
Anuken 926cf7e0fa Fixed some messed-up objectives 2022-07-15 16:56:34 -04:00
Github Actions 3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
GlennFolkerandGitHub 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
BetaEridaniandGitHub 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
CatchearsGitHubJoeFLYtheCoderAnuken
 		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 f149bed64e Tweaked split 2022-07-14 15:11:11 -04:00
Epowerj 9d3bf2d489 Tweaked split 2022-07-14 15:06:57 -04:00
Epowerj 43416f90e5 Added description to split 2022-07-14 14:50:00 -04:00
Epowerj 3a3eb2c63d Progress on split 2022-07-13 15:05:52 -04:00
Epowerj 24e70faf02 Start reworking split 2022-07-12 20:37:17 -04:00
Epowerj 458ab9d639 tweaked atlas 2022-07-11 21:36:15 -04:00
Epowerj ca18b851a1 Tweaked atlas, set max squad size 2022-07-11 18:44:28 -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
BetaEridaniandGitHub 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
BetaEridaniandGitHub 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
JerzozwierzandGitHub 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
Epowerj 5d852085c2 Tweaked three 2022-07-08 18:35:56 -04:00
Anuken 3da0486320 Indonesian bundle loading hack 2022-07-08 17:07:49 -04:00
Github Actions 0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Epowerj 32d586617d tweaked sector three 2022-07-07 17:03:30 -04:00
Epowerj c2a9c77510 Added a sector description for three 2022-07-07 16:57:12 -04:00