Commit Graph

15303 Commits

Author SHA1 Message Date
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
26dc90e5a2 Hold back slag heater unlock until [4] 2022-08-30 14:56:58 -04:00
Epowerj
953b43e041 Tweaks to afflict research cost 2022-08-30 14:52:37 -04:00
Epowerj
400155ffed Tweaks to ravine 2022-08-30 14:44:36 -04:00
Epowerj
9dbdb05ede Rearranged tech tree for turrets 2022-08-30 14:43:47 -04:00
Epowerj
19ca24825c Tweaks to surge block research costs 2022-08-30 14:05:05 -04:00
Epowerj
6e9ddea56e Tweaks to ravine 2022-08-30 13:31:09 -04:00
Cryofluid
4902c525fc
Update bundle.properties (#7482) 2022-08-30 06:46:54 -04:00
Epowerj
9996f3b6f5 Set a capture wave for ravine 2022-08-29 20:06:27 -04:00
Epowerj
ef02906db4 Tweaks to ravine 2022-08-29 19:10:49 -04:00
Anuken
2f6ef4cefe Merge remote-tracking branch 'origin/master' 2022-08-29 18:57:27 -04:00
Anuken
55c54b34f9 Fixed #7477 2022-08-29 18:57:20 -04:00
Epowerj
715dfb16ca Adjusted tech tree for ravine 2022-08-29 18:46:34 -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
MEEPofFaith
2703c0cbc4
alwaysShooting (#7475) 2022-08-29 17:23:20 -04:00
Github Actions
d012521f23 Automatic bundle update 2022-08-29 20:55:18 +00:00
Epowerj
b7ca88c9c5
Merge pull request #7476 from ThatOneBepis/master
Map submission from ThatOneBepis - thanks for the map.
2022-08-29 16:54:26 -04:00
ThatOneBepis
f103540193
Map submission 2022-08-29 22:49:28 +02: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
e4fe73b332 Minor balance tweak 2022-08-29 13:40:15 -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
Anuken
cef63bae3a Merge remote-tracking branch 'origin/master' 2022-08-28 16:08:15 -04:00
Anuken
d5b34f0b73 Fixed #7469 2022-08-28 16:08:09 -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
RTOmega
4bc813a203
Added CastleWars V7 (#7461) 2022-08-27 13:50:15 -04:00
router
91440e7055
drill mined item sensing (#7460)
* add drill sensing

* PROPERLY
2022-08-27 11:18:14 -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
Mythril382
32c8167b7c
drawSelect for RepairTower (#7447) 2022-08-26 08:07:59 -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
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