mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-13 00:05:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,303 Commits 4 Branches 160 Tags 2.1 GiB
3874d2c7a1
Commit Graph

15303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
thedimas
055eb5caec
thedimas moved to v7 (#7513) 
* Update servers_v7.json

* Update servers_v6.json
 2022-09-04 11:53:04 -04:00
Joan Josep
f8580d29fc
Update bundle_ca.properties (#7514) 2022-09-04 11:52:52 -04:00
Anuken
19d26a0593 Merge remote-tracking branch 'origin/master' 2022-09-03 11:00:06 -04:00
Anuken
1f4372ebc7 Don't allow mixtech in new maps 2022-09-03 11:00:01 -04:00
VaporSpace2
74e98799c4
add generic survival server to v6 server list (#7510) 
fourth time messing up, hopefully the other mess ups didnt get pushed as pull requests
 2022-09-03 07:58:09 -04:00
Anuken
b48053cda4 ClassMap update 2022-09-03 07:57:06 -04:00
Anuken
1748753a20 Fixed #7508 2022-09-03 07:46:18 -04:00
Anuken
ed1819fda1 Merge remote-tracking branch 'origin/master' 2022-09-02 17:15:24 -04:00
Anuken
80774820dc More unit cargo loader capacity 2022-09-02 17:15:20 -04:00
Epowerj
39fa64a41c Merge remote-tracking branch 'origin/master' 2022-09-02 15:23:27 -04:00
Epowerj
cf8861bb13 Caldera tweaks 2022-09-02 15:22:18 -04:00
Anuken
c8f5862582 Merge remote-tracking branch 'origin/master' 2022-09-02 14:39:34 -04:00
Anuken
bd049d4c8d Minor liquid current tweaks 2022-09-02 14:39:26 -04:00
router
5e5b8711a3
Update Pump.java (#7500) 2022-09-02 08:58:31 -04:00
Anuken
2b6a7eac45 Fixed #7501 2022-09-02 08:57:57 -04:00
Anuken
e699e199ea Merge remote-tracking branch 'origin/master' 2022-09-02 08:35:00 -04:00
Anuken
ceb5c832bd Fixed armored duct blending 2022-09-02 08:34:53 -04:00
Github Actions
337bf880ab Automatic bundle update 2022-09-02 00:57:33 +00:00
Epowerj
8b629b9b8b Merge remote-tracking branch 'origin/master' 2022-09-01 20:56:42 -04:00
Epowerj
296fc338f9 Caldera tweaks 2022-09-01 20:56:28 -04:00
Epowerj
c1775bf16b Tweaked tech tree for caldera 2022-09-01 20:56:14 -04:00
Epowerj
2bbcf601aa Tweaked research costs for caldera unlocks 2022-09-01 20:56:06 -04:00
Epowerj
5810e308d4 Fixed bundle names for caldera 2022-09-01 20:55:54 -04:00
MEEPofFaith
e9d3adfef3
Options for SectorPreset overriding plant launch fields. (#7478) 
* Preset overriding loadouts

* a

* You know I should really learn what this actually does
 2022-09-01 20:47:53 -04:00
Anuken
b854b0ca22 Better item selection UI 2022-09-01 17:49:29 -04:00
Anuken
61295bc89c Slightly longer data timeout 2022-09-01 16:49:17 -04:00
Anuken
bc1ff011af parens 2022-09-01 10:49:41 -04:00
Anuken
d216f3920d Merge remote-tracking branch 'origin/master' 2022-09-01 08:57:51 -04:00
Anuken
2d47ff893b Misc fixes 2022-09-01 08:57:43 -04:00
Github Actions
a2f36315b3 Automatic bundle update 2022-09-01 12:48:26 +00:00
Nunting
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
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