mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-30 22:49:06 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,259 Commits 3 Branches 166 Tags
cc5f8fed50f6bfb888e48d191a0cc545f5faddf7
Commit Graph

3530 Commits

Author SHA1 Message Date
NotFinboror
662e9c5dbb Translations and fixes of grammatical errors (#7568) 2022-09-14 07:30:27 -04:00
Anuken
a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -04:00
Epowerj
f968a8689c Cleaning up caldera 2022-09-10 16:53:59 -04:00
Github Actions
e279ac269b Automatic bundle update 2022-09-09 22:09:40 +00:00
AB
6c9108f370 Update bundle_pt_BR.properties (#7535) 
* Update bundle_pt_BR.properties

[Portuguese] Avisos: Evitei a tradução da parte de logic, nomes de unidades e torretas. Muitas das traduções foram adaptadas, pois de forma literal ficava estranho e "feio". 
Tradução feita e revisada durante uns 5 ou 6 dias.
Caso você encontre erros, me avise no discord: ABÊ#8931
[English] Disclaimer: I avoided translating the logic part, unit and turrets names. Many of the translations were adapted, because the literal way was strange and "ugly". 
Translation done and revised during 5 or 6 days.
If you find errors, let me know at discord: ABÊ#8931

* Update bundle_pt_BR.properties
 2022-09-09 18:08:36 -04:00
Anuken
979509acce Merge remote-tracking branch 'origin/master' 2022-09-09 14:28:45 -04:00
Anuken
f3002ef7c1 Fixed #7536 2022-09-09 14:28:36 -04:00
Github Actions
4410e90b9e Automatic bundle update 2022-09-07 22:55:23 +00:00
MEEPofFaith
31149c08ea More control over wave sending (#7442) 
* Wave send rule

* Send natural wave command

* Use a boolean

* boolean selection

* Revert "boolean selection"

This reverts commit 01e7a8f0e0.

* Natural wave last

* I don't see why it wouldn't
 2022-09-07 18:54:26 -04:00
Github Actions
13ff9a035a Automatic bundle update 2022-09-04 20:33:05 +00:00
Anuken
6a79421040 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-09-04 16:32:16 -04:00
Anuken
08d5ca1912 Removed shield breaker block 2022-09-04 16:32:13 -04:00
Joan Josep
f8580d29fc Update bundle_ca.properties (#7514) 2022-09-04 11:52:52 -04:00
Github Actions
337bf880ab Automatic bundle update 2022-09-02 00:57:33 +00:00
Epowerj
5810e308d4 Fixed bundle names for caldera 2022-09-01 20:55:54 -04:00
Github Actions
a2f36315b3 Automatic bundle update 2022-09-01 12:48:26 +00:00
Nunting
88e8165867 Update bundle_ko.properties (#7497) 
* Update bundle_ko.properties

Wait

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-09-01 08:47:38 -04:00
Mythril382
e8ec1c51f4 shielded wall description (#7492) 2022-08-31 22:11:18 -04:00
Github Actions
99df85df1c Automatic bundle update 2022-08-31 23:08:27 +00:00
Epowerj
72db5ff9f7 Added caldera to bundles 2022-08-31 18:56:00 -04:00
Github Actions
12906e17c9 Automatic bundle update 2022-08-31 01:18:58 +00:00
Anuken
8f4251db3a Merge remote-tracking branch 'origin/master' 2022-08-30 21:17:44 -04:00
Anuken
4cd78aad91 Fixed #7484 2022-08-30 21:17:39 -04:00
Epowerj
a0cc74891a Merge branch 'map1' 2022-08-30 15:53:09 -04:00
Cryofluid
4902c525fc Update bundle.properties (#7482) 2022-08-30 06:46:54 -04:00
Epowerj
76997f8d47 typo 2022-08-29 17:49:03 -04:00
Github Actions
73ef72a8e3 Automatic bundle update 2022-08-29 21:45:18 +00:00
Epowerj
697e6d503f Added ravine to campaign list 2022-08-29 17:44:19 -04:00
Github Actions
d012521f23 Automatic bundle update 2022-08-29 20:55:18 +00:00
ThatOneBepis
424b0ed5d7 as per usual 2022-08-29 22:48:15 +02:00
Anuken
0d3c27dd59 Minor bundle tweaks 2022-08-29 14:26:29 -04:00
Anuken
d7abd35c97 Merge remote-tracking branch 'origin/master' 2022-08-29 13:37:54 -04:00
Anuken
07781f685d Heat wording changing 2022-08-29 13:37:49 -04:00
Phinner
ec48504bd2 French Translation: The end of the trilogy (#7434) 
* hello again

* smol but nice changes

* partial merge of #7293

The dude seems to be inactive so...

* zeta edits

* zeta edits 2

* zeta edits 3

* smol edits

* new unit translations

* many thanks xorblo-doitus

* praise language tool :)

* tiny fixes
 2022-08-29 12:40:08 -04:00
Anuken
74697a389c Updated bundles with new descriptions 2022-08-29 12:23:44 -04:00
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Angel-24
f5a426bc12 Update bundle_es.properties (#7467) 
Fixed a little misapprehension.
 2022-08-28 08:18:05 -04:00
Nunting
32a8472b20 Update bundle_ko.properties (#7464) 
* Update bundle_ko.properties

Not done

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-08-28 08:15:20 -04:00
Github Actions
21ce48c5b5 Automatic bundle update 2022-08-27 23:47:07 +00:00
Anuken
2f45bb596b Merge remote-tracking branch 'origin/master' 2022-08-27 19:46:00 -04:00
Anuken
ff3a1c23c2 Removed unmerged PR leftovers for now 2022-08-27 19:45:56 -04:00
MEEPofFaith
cf0c7ff2d8 "Arkycite Floor" -> "Arkycite" (#7462) 2022-08-27 19:44:33 -04:00
Github Actions
b511a37a04 Automatic bundle update 2022-08-27 23:40:50 +00:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
Epowerj
9fd340d219 Tweaks to basin description 2022-08-26 12:31:42 -04:00
RTOmega
80d772b96e TR Bundle Update (erekir units) (#7449) 
* TR Bundle Update

* güncerleme -> sürüm güncerlemesi

* Editor Translation Fix + Eleman -> Birim

* mini fixes

* Unit desc

* kumdan

* Update bundle_tr.properties
 2022-08-26 08:07:07 -04:00
Github Actions
7b63ec203e Automatic bundle update 2022-08-24 17:49:15 +00:00
Anuken
3f4ae7fed3 Merge remote-tracking branch 'origin/master' 2022-08-24 13:47:48 -04:00
Anuken
69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00