Commit Graph
6003 Commits
Author SHA1 Message Date
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
MEEPofFaithandGitHub 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
Epowerj aa9ff44a61 Tweaks to caldera 2022-09-05 14:13:35 -04:00
Epowerj b93be10e43 Tweaks to caldera 2022-09-04 22:00:58 -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 JosepandGitHub f8580d29fc Update bundle_ca.properties (#7514) 2022-09-04 11:52:52 -04:00
Epowerj cf8861bb13 Caldera tweaks 2022-09-02 15:22:18 -04:00
Github Actions 337bf880ab Automatic bundle update 2022-09-02 00:57:33 +00:00
Epowerj 296fc338f9 Caldera tweaks 2022-09-01 20:56:28 -04: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
NuntingandGitHub 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
Mythril382andGitHub 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 f1d4ec004d Removed banned blocks from ravine 2022-08-31 19:07:21 -04:00
Epowerj a7ffaff270 Tweaks to caldera 2022-08-31 18:56:09 -04:00
Epowerj 72db5ff9f7 Added caldera to bundles 2022-08-31 18:56:00 -04:00
Epowerj 8c5f6bf171 Rename caldera map file to distinguish from the serpulo map 2022-08-31 01:08:17 -04:00
hhhi17andGitHub 7d7b02edb1 Add files via upload 2022-08-31 07:56:08 +03: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
Epowerj 68fc855870 Tweaks to ravine 2022-08-30 15:50:40 -04:00
Epowerj 400155ffed Tweaks to ravine 2022-08-30 14:44:36 -04:00
Epowerj 6e9ddea56e Tweaks to ravine 2022-08-30 13:31:09 -04:00
CryofluidandGitHub 4902c525fc Update bundle.properties (#7482) 2022-08-30 06:46:54 -04:00
Epowerj ef02906db4 Tweaks to ravine 2022-08-29 19:10:49 -04:00
Epowerj d5c8f66d53 Peaks tweaks 2022-08-29 18:10:59 -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
Epowerj b495308832 Tweaks to ravine 2022-08-29 17:33:05 -04:00
Github Actions d012521f23 Automatic bundle update 2022-08-29 20:55:18 +00:00
ThatOneBepisandGitHub f103540193 Map submission 2022-08-29 22:49:28 +02:00
ThatOneBepisandGitHub 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
PhinnerandGitHub 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-24andGitHub f5a426bc12 Update bundle_es.properties (#7467)
Fixed a little misapprehension.
2022-08-28 08:18:05 -04:00
NuntingandGitHub 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