mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,170 Commits 4 Branches 160 Tags 2.3 GiB
56856c8166
Commit Graph

15170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
56856c8166 Merge remote-tracking branch 'origin/master' 2022-09-01 08:46:36 -04:00
Anuken
5ecd73bdb0 Fixed #7495 2022-09-01 08:46:31 -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
f1d4ec004d Removed banned blocks from ravine 2022-08-31 19:07:21 -04:00
Epowerj
be2160c9df Tech tree updates for caldera 2022-08-31 18:56:27 -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
7e6ba4a98e Added caldera to the campaign 2022-08-31 18:15:56 -04:00
Anuken
920cedb334 Merge remote-tracking branch 'origin/master' 2022-08-31 08:08:13 -04:00
Anuken
fb24953dc2 Added support for non-reactive liquids 2022-08-31 08:08:07 -04:00
Epowerj
8c5f6bf171 Rename caldera map file to distinguish from the serpulo map 2022-08-31 01:08:17 -04:00
Epowerj
342fb3998f
Merge pull request #7487 from hhhi17/master 
Added caldera - thanks to hhhi17 for the map
 2022-08-31 01:03:27 -04:00
hhhi17
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
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