Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,217 Commits 4 Branches 180 Tags
31149c08eaa15e75e5519719f660bc2b663aa92b
Commit Graph
12867 Commits
Author SHA1 Message Date
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
Anuken 687bc11e54 Merge remote-tracking branch 'origin/master' 2022-09-07 08:56:45 -04:00
Anuken 51d4853351 Fixed #7525 2022-09-07 08:56:41 -04:00
WayZerandGitHub 5c1e3a2862 Add WorldBeforeLoadEvent and WorldEndLoadEvent (#7523) 
* Add `WorldBeforeLoadEvent` and `WorldEndLoadEvent`

* rename
 2022-09-07 08:24:31 -04:00
Anuken 67552add78 Fixed #7526 2022-09-07 08:09:04 -04:00
Anuken 6d2251c52d Merge remote-tracking branch 'origin/master' 2022-09-06 00:05:56 -04:00
Anuken 90fe7b75d1 CommandAI counter-attack timer 2022-09-06 00:05:49 -04:00
JniTrRnyandGitHub ffb3535f56 Generation quick copy & paste (#7520) 
* several UI changes

* block ID bad
 2022-09-05 14:59:21 -04:00
Epowerj aa9ff44a61 Tweaks to caldera 2022-09-05 14:13:35 -04:00
xStaBUxandGitHub c437a98b40 Copied. (#7519) 2022-09-05 13:38:05 -04:00
Epowerj b93be10e43 Tweaks to caldera 2022-09-04 22:00:58 -04:00
Epowerj 48e5846587 Tweaked research costs 2022-09-04 21:19:09 -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
Anuken 1f4372ebc7 Don't allow mixtech in new maps 2022-09-03 11:00:01 -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
routerandGitHub 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
MEEPofFaithandGitHub 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
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
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
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 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