Commit Graph

13567 Commits

Author SHA1 Message Date
Anuken
dcf9aa9793 Fixed #8132 2023-01-08 10:19:47 -05:00
Github Actions
45591fab83 Automatic bundle update 2023-01-08 06:24:54 +00:00
Anuken
658ebf4bc5 Merged #8053 2023-01-08 01:23:54 -05:00
Joan Josep
59c2a11824 Update bundle_ca.properties (#7947) 2023-01-08 01:22:32 -05:00
Github Actions
33a57b11f6 Automatic bundle update 2023-01-08 05:18:51 +00:00
Anuken
d082963167 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/assets/bundles/bundle_es.properties
2023-01-08 00:17:52 -05:00
Anuken
e2fa834079 Merge of #7987 2023-01-08 00:16:58 -05:00
Khanx
e6bfc1cee8 Updated spanish translation (#7928) 2023-01-08 00:15:55 -05:00
Miniontoby
0211732520 Fixed sand-floor translation in Dutch (#8058)
Changed from 'Donker Zand' which means 'dark sand' to 'Zand' which is just 'sand'
2023-01-07 23:38:12 -05:00
adamlolgaming
33f6004c81 Update bundle_pl.properties (#8057) 2023-01-07 23:34:18 -05:00
Anuken
62e33effd1 CargoAI target clearing 2023-01-07 19:34:36 -05:00
Anuken
be8fec55e1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-01-07 16:22:06 -05:00
Anuken
76430c1e68 a 2023-01-07 16:21:03 -05:00
Garen7
832b5e62bf Fixes typo on Payload Mass Drivers (#8090)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 16:14:04 -05:00
Anuken
4c09f6dd40 Fixed #8025 2023-01-07 15:07:54 -05:00
Anuken
f1e1eb1015 Fixed #8015 2023-01-07 14:54:15 -05:00
Anuken
963b96a1fb Merge remote-tracking branch 'origin/master' 2023-01-07 14:47:14 -05:00
Anuken
87786441ff Fixed #8117 2023-01-07 14:47:10 -05:00
Anuken
05dec4df6a Fixed #8117 2023-01-07 14:46:31 -05:00
MEEPofFaith
a3270debac Fix collideLine (#8037) 2023-01-07 14:46:19 -05:00
Github Actions
cf392d13ed Automatic bundle update 2023-01-07 19:43:14 +00:00
Prosta4okua
574a10e5f8 🍉🍉🍉 Watermelons have deployed. Prepare yourself for new Ukrainian translation for v7 release (#7885)
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* будівль -> будівель
2023-01-07 14:42:27 -05:00
Anuken
eb410af371 sandbox is now actually sandbox again 2023-01-07 14:41:12 -05:00
Anuken
542bf2b413 Fixed #8084 2023-01-07 14:26:25 -05:00
Anuken
723b10af57 Fixed #7944 2023-01-07 14:18:07 -05:00
Anuken
1394c49e48 Fixed #8008 2023-01-07 14:10:41 -05:00
Anuken
d8ecdff698 Merge remote-tracking branch 'origin/master' 2023-01-07 14:01:33 -05:00
Anuken
2a71f4620e Fixed #7962 2023-01-07 14:01:28 -05:00
Slotterleet
fe99c7da62 Update bundle_ru.properties (#7973) 2023-01-07 14:00:32 -05:00
Anuken
0b00747f29 Merge remote-tracking branch 'origin/master' 2023-01-07 13:53:07 -05:00
Anuken
ae4a41cd0b Fixed #8042 2023-01-07 13:53:03 -05:00
GlennFolker
93f630bb69 Make custom Env flag reliably possible (#8019)
* Make custom Env flag reliably possible

* screw you

* "compatibility" for mods that don't use add()
2023-01-07 13:48:28 -05:00
Anuken
d7d5ba7510 Fixed #8060 2023-01-07 13:44:34 -05:00
Anuken
e846084942 Merge remote-tracking branch 'origin/master' 2023-01-07 13:42:48 -05:00
Anuken
a15b887e5c Fixed #8011 2023-01-07 13:42:43 -05:00
Github Actions
4e51586b3b Automatic bundle update 2023-01-07 18:23:43 +00:00
Phinner
d3a90d68d1 Update bundle_fr.properties (reopen of #7883) (#7918)
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀
2023-01-07 13:22:58 -05:00
Github Actions
78973d3f12 Automatic bundle update 2023-01-07 18:17:21 +00:00
Anuken
c37ad9210a Merge remote-tracking branch 'origin/master' 2023-01-07 13:15:59 -05:00
Anuken
246591eab4 Fixed #8119 2023-01-07 13:15:56 -05:00
MEEPofFaith
eb0481a1da Cargo units *will* chase you down if you pick up their target. (#8033) 2023-01-07 12:55:19 -05:00
Garen7
ba72e9c50d Fixes Tanks rotating needlessly after attack commands (#8112)
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
2023-01-07 12:54:26 -05:00
Anuken
54a9955e30 #8126 2023-01-07 12:44:29 -05:00
Anuken
49bcbafdaa Fixed #7946 2023-01-07 12:39:12 -05:00
Anuken
b4137dca6e Fixed #7978 2023-01-07 12:37:37 -05:00
Anuken
98f869ecea Fixed #8086 / Fixed #8065 2023-01-07 12:15:37 -05:00
Anuken
0c9f2b2687 Fixed #8092 2023-01-07 12:06:57 -05:00
Anuken
4ec4e83823 Fixed #7932 2023-01-07 12:04:36 -05:00
Anuken
96477f7ff5 Merge remote-tracking branch 'origin/master' 2023-01-07 12:03:58 -05:00
Anuken
1236e8d342 Fixed #7922 2023-01-07 12:03:54 -05:00