Commit Graph
5937 Commits
Author SHA1 Message Date
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
MEEPofFaithandGitHub 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
Epowerj 53ed4dd072 Tweaks to basin 2022-08-26 12:27:11 -04:00
RTOmegaandGitHub 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
Anuken 82bb4607db Fixed basin spawn timer 2022-08-25 19:47:55 -04:00
Anuken 3f8d4c5459 Merge remote-tracking branch 'origin/master' 2022-08-25 15:09:26 -04:00
Anuken 8dca512b37 Minor sound tweaks 2022-08-25 15:09:21 -04:00
Epowerj 9f7d2b180e Merge branch 'maps_phase_2' 2022-08-25 01:15:59 -04:00
Epowerj 8bc05be30e Tweaks on peaks :) 2022-08-25 01:13:34 -04:00
Epowerj b8349bae19 Tweaks on peaks :) 2022-08-25 00:53:49 -04:00
Epowerj 94690b6edd Tweaks to marsh 2022-08-24 21:49:13 -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