Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,946 Commits 4 Branches 180 Tags
56ed932716d7d508c724a9b51b19578b048db497
Commit Graph
13503 Commits
Author SHA1 Message Date
Github Actions 6968ccc19b Automatic bundle update 2022-11-10 22:17:45 +00:00
Anuken bc96077d73 Merge remote-tracking branch 'origin/master' 2022-11-10 17:16:55 -05:00
Anuken 255e15d14c Added some missing block descriptions 2022-11-10 17:16:50 -05:00
Github Actions 544835fdda Automatic bundle update 2022-11-10 21:38:54 +00:00
Anuken 2642ed358a Merge remote-tracking branch 'origin/master' 2022-11-10 16:37:54 -05:00
Anuken 642d27c163 Fixed missing block name 2022-11-10 16:37:50 -05:00
Github Actions 8cdb32e476 Automatic bundle update 2022-11-10 18:43:12 +00:00
Epowerj 9457680bae Added peaks and marsh descriptions 2022-11-10 13:42:15 -05:00
nullandGitHub 75a47a2e5f unhard code sorter cross region, I guess (#7858) 
* someone asked for this

* it didn't save fuck

* this, again
 2022-11-10 12:39:54 -05:00
Anuken e198da53e4 Merge remote-tracking branch 'origin/master' 2022-11-10 12:15:55 -05:00
Anuken c1e783ba71 PayloadSource UnitCreateEvent 2022-11-10 12:15:51 -05:00
Github Actions 3dfb8c4c20 Automatic bundle update 2022-11-10 16:41:24 +00:00
CatchearsGitHubend-me-please
 		d81500d99d german translation (again) (#7232) 
* update to 9a3a6c31b3

* shawak's requested changes

* update sector names

no one has opposed them yet, so we'll give them a try

* oops, accidentally modified english bundle, reverting

* update translation to a54907583b

* changes as requested by shawak

* update to 522070be4b

* @stuffyAI's changes

* update to https://github.com/Anuken/Mindustry/commit/69a735446845acc16b1a63f20e5b419e7b659623

* remove duplicate entries

new translations are quite plentiful, will take a bit to get done

* update to https://github.com/Anuken/Mindustry/commit/99df85df1c4acdd8c347f22a3116d7f962140229

* vereinheitlichung - siehe commitbeschreibung

unterschied zwischen items und materialien verdeutlichen
vereinheitlichung von 'fracht' als begriff für 'payload'

ich halte diese verändernungnen für vernünftig, bin aber wie immer offen für andere vorschläge

bei 'materialeinheiten' (unit.items, zeile 976) bin ich mir unsicher, ob der begriff inzwischen veraltet ist (stattdessen lieber items?) - er wird nur an zwei stellen benutzt, die nur vor jahren bearbeitet wurden. ich habe ihn erstmal beibehalten.

* update to f968a8689c

* update to https://github.com/Anuken/Mindustry/commit/85228bad0ab334874b702c74e79338f956b69f68

* update to https://github.com/Anuken/Mindustry/commit/e3d1a04626568680d57472959613a6c112f24101

* update to https://github.com/Anuken/Mindustry/commit/634ece405f875d73df36e979b8572a156f516016

I'll probably be keeping this PR more up to date as we get closer to v7 release date, feel free to unsub from the PR if it gets annoying.

* update to https://github.com/Anuken/Mindustry/commit/ebb37f4abe6593f65b5fa3707e81781be1d0015b

* der Mod -> die Mod

Mod, abgeleitet von Modifikation (f), sollte mMn weiterhin feminin bleiben.

* update to https://github.com/Anuken/Mindustry/commit/8f9736d1d9597c288778b6e1711e5147685bbe4b

* update to https://github.com/Anuken/Mindustry/commit/c3d9a501c6a8fb417d8b0f32c0f681c3ff338cba

hopefully final update

* add changes from https://github.com/Anuken/Mindustry/pull/6999/files

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>
 2022-11-10 11:40:35 -05:00
Даркнесс#3729andGitHub 2a11ac6414 fixes (#7856) 2022-11-10 09:18:09 -05:00
Github Actions 89e3f2a2fa Automatic bundle update 2022-11-10 13:24:03 +00:00
Anuken 5440ffcaf9 Merge remote-tracking branch 'origin/master' 2022-11-10 08:22:59 -05:00
Anuken 3fe38e8925 Better fix for #7854 2022-11-10 08:22:53 -05:00
Даркнесс#3729GitHubEvgenijSlotterleet
 		fcca002823 [Translation] RU V7 translation (#7785) 
* [Translation] RU V7 translation

* Категории процессоров

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* 👀

* Update bundle_ru.properties

* скилл исьюше

* Подсказки для командного режима

* Немного перевел цели секторов

* попробовал сделать описания юнитов :/

* Update bundle_ru.properties

* Update bundle_ru.properties

* дрели

* Create bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* нагрев -> тепло

* Подсказки

* Update contributors

* Update bundle_ru.properties

* скилл иссуе

* Update bundle_ru.properties

Co-authored-by: Evgenij <86189625+Kowkodivka@users.noreply.github.com>
Co-authored-by: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
 2022-11-10 08:22:10 -05:00
JerzozwierzandGitHub 11e35370be Update bundle_pl because 11.11 is close (#7853) 2022-11-09 14:14:37 -05:00
Anuken 2e9026936e Less floating menu buttons 2022-11-09 14:05:22 -05:00
Anuken 1651dc520c Better inset borders for phones 2022-11-09 13:56:53 -05:00
Anuken ef526a6d83 Merge remote-tracking branch 'origin/master' 2022-11-09 13:29:17 -05:00
Anuken be72da71de map name 2022-11-09 13:29:13 -05:00
NuntingandGitHub b0303e84a3 Update bundle_ko.properties (#7850) 2022-11-09 08:47:50 -05:00
Anuken 37f1760a59 Renamed 'erekir waves map' 2022-11-09 08:45:11 -05:00
Anuken 8d255b3ccd Fixed #7852 2022-11-09 08:31:19 -05:00
Anuken 1842e9d139 Merge remote-tracking branch 'origin/master' 2022-11-09 08:30:01 -05:00
Anuken 8f7419db71 Fixed #7851 2022-11-09 08:29:53 -05:00
Anuken 56eb1a084c Revert "Fixing a mistake I made (#7788)" 
This reverts commit 3c7ddc8375.
 2022-11-09 08:29:32 -05:00
Github Actions e5e41b497d Automatic bundle update 2022-11-09 02:46:35 +00:00
Anuken 52d2d25790 Merge remote-tracking branch 'origin/master' 2022-11-08 21:44:53 -05:00
Anuken c3d9a501c6 Campaign completion text in bundle 2022-11-08 21:44:47 -05:00
NuntingandGitHub baa7580e13 Update bundle_ko.properties (#7806) 2022-11-08 18:47:17 -05:00
Anuken 464feaa80e Merge remote-tracking branch 'origin/master' 2022-11-08 16:52:18 -05:00
Anuken ddadbab74d Canvas block blending 2022-11-08 16:52:12 -05:00
LonamiandGitHub 41562ac6c1 Don't stop mining while commanding units (#7844) 
This addresses https://github.com/Anuken/Mindustry-Suggestions/issues/4077.
 2022-11-08 08:57:27 -05:00
MEEPofFaithandGitHub 8f9736d1d9 Make certain negative stats red (#7842) 2022-11-07 21:28:28 -05:00
MEEPofFaithandGitHub 68434ad42e Clearer Building Damage Multiplier Stat (#7471) 2022-11-07 17:59:47 -05:00
BF 109 F-4andGitHub 3c7ddc8375 Fixing a mistake I made (#7788) 
* Add files via upload

* Delete Erekir Waves Map better.msav

* Fixing a mistake

I uploaded it incorrectly last time so I'm fixing it.

* Old version

Fixed
 2022-11-07 15:50:47 -05:00
Anuken 381197d58f Merge remote-tracking branch 'origin/master' 2022-11-07 15:07:36 -05:00
Anuken 09b65fddb8 Fixed #7841 2022-11-07 15:07:32 -05:00
Github Actions 4050812b84 Automatic bundle update 2022-11-07 16:28:17 +00:00
Anuken 927566e038 Merge remote-tracking branch 'origin/master' 2022-11-07 11:27:11 -05:00
Anuken a329c4944b Fixed #7839 2022-11-07 11:27:07 -05:00
Github Actions 47a38d2bb8 Automatic bundle update 2022-11-07 15:22:08 +00:00
SoMall-dumplingandGitHub d20f4c42a7 Update bundle_zh_CN.properties (#7666) 
* Update bundle_zh_CN.properties

Translations for v139

* Update bundle_zh_CN.properties

abcigch的建议/其他修改

* 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

a tweak to origin
 2022-11-07 10:21:20 -05:00
Github Actions 14984f6a02 Automatic bundle update 2022-11-07 14:44:21 +00:00
ThatOneBepisGitHubAnuken
 		e428e33cd2 Update bundle_sr.properties (#7810) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-07 09:43:16 -05:00
Anuken ce36b750e3 Merge remote-tracking branch 'origin/master' 2022-11-07 08:43:26 -05:00
Anuken e0021f3714 Fixed #7837 2022-11-07 08:43:22 -05:00