Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,338 Commits 4 Branches 180 Tags
a36e31c4b40f67422ee1adb171643846011fb162
Commit Graph
13790 Commits
Author SHA1 Message Date
WayZerandGitHub 53f410fee0 Fix Turret bug when cheat (#8273) 
* （C/S) Fix ItemTurret ammo when `cheat`.

* （C/S) Fix `TurretBuild.updateReload` NPE when `cheat`
 2023-02-09 09:20:06 -05:00
Github Actions 66406806b7 Automatic bundle update 2023-02-09 03:49:19 +00:00
Anuken 3a6debfae6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2023-02-08 22:48:33 -05:00
Anuken a093fa5718 Replaced #8035 2023-02-08 22:48:17 -05:00
Даркнесс#3729andGitHub 9c1f17fbdd Add pvpAutoPause rule (#8249) 
* Update Rules.java

* Update NetServer.java
 2023-02-08 22:44:07 -05:00
MEEPofFaithandGitHub ce3643f0b3 Make type not required if the template already provides one (#8257) 
Such as with missile units
 2023-02-08 22:35:13 -05:00
MEEPofFaithandGitHub f1fb7d8098 Fix modded payload conveyor icons (#8266) 2023-02-08 22:28:44 -05:00
Anuken 3d01eeaf1c Fixed #8251 2023-02-08 22:25:10 -05:00
Github Actions be39c31865 Automatic bundle update 2023-02-01 20:22:46 +00:00
PhinnerandGitHub 0d2dfadba7 Mod dependency resolution improvements (#7972) 
* soft dependencies + better mod resolution algorithm

* update ModMeta#toString

* var

* add #7962 bugfix

* Use existing code to resolve

* add state text for mod dialog

* bugfix

* fix error text

* remove external resolver class

It's simpler like that :)
 2023-02-01 15:21:42 -05:00
Anuken 2dcab97b6d Merge remote-tracking branch 'origin/master' 2023-02-01 15:20:38 -05:00
Anuken 31cb169002 Random server order 2023-02-01 15:20:34 -05:00
LeTuanVNandGitHub c381499c58 Update vi translation (#8225) 
* Update bundle_vi.properties

* Update bundle_vi.properties
 2023-02-01 14:57:09 -05:00
MEEPofFaithandGitHub 12f747ae1d Strip colors from mod name as well (#8224) 2023-02-01 14:45:56 -05:00
Даркнесс#3729andGitHub c945243795 It doesn't work (#8237) 2023-02-01 14:45:00 -05:00
Anuken c2262cc9cf Fixed #8235 / Fixed #8221 2023-02-01 14:42:50 -05:00
Anuken 411399e96f Fixed #8211 2023-02-01 14:18:29 -05:00
Anuken f833b9e0ce Fixed #8236 2023-02-01 14:09:16 -05:00
Anuken d2792a4e9d Fixed #8202 2023-01-22 08:59:32 -05:00
Anuken 6ef8d64d46 Efficiency fix 2023-01-20 09:37:28 -05:00
Anuken 85b8868d2b Fixed #8194 2023-01-18 10:41:39 -05:00
Anuken 65e92ab6fc Merge remote-tracking branch 'origin/master' 2023-01-17 18:50:49 -05:00
Anuken 478baf2532 Fixed #8192 2023-01-17 18:50:44 -05:00
Joan JosepandGitHub 0750348cb1 Update bundle_ca.properties (#8190) 2023-01-17 18:49:20 -05:00
Anuken b4359c0489 Merge remote-tracking branch 'origin/master' 2023-01-16 15:28:45 -05:00
Anuken 977192bc54 Fixed #8187 2023-01-16 15:28:40 -05:00
南门阳德andGitHub d54b557a9f Revert #8176 (#8186) 
Liquid turrets are used to give buff like wet but not do the damage. The ammo change is not appropriate.
 2023-01-16 11:07:00 -05:00
Anuken f6c97f4ff6 Fixed #8185 2023-01-16 11:06:34 -05:00
Anuken 66f4118896 Fixed #8184 2023-01-15 15:19:13 -05:00
Anuken 4a8f8c4ecf Merge remote-tracking branch 'origin/master' 2023-01-15 08:51:57 -05:00
Anuken 6d7c207b95 Fixed drawing of assembler payloads 2023-01-15 08:51:51 -05:00
KnochiandGitHub 98157f2852 Never use „tun“ in German language (#8179) 2023-01-14 14:41:14 -05:00
MEEPofFaithandGitHub 5e324e71d4 Hitscan fix 2 (#8175) 
* Revert "Reverting #8037"

Re-implement #8037

* Properly count collisions

Fix #8170
 2023-01-14 10:05:30 -05:00
Anuken 3159ce6707 Merge remote-tracking branch 'origin/master' 2023-01-13 19:34:52 -05:00
Anuken 9b033532c8 Fixed #8177 2023-01-13 19:34:48 -05:00
Даркнесс#3729andGitHub 0678592d59 Fix cheaty item and liquid turrets (#8176) 
* Update Turret.java

* Update TractorBeamTurret.java

* Update TractorBeamTurret.java

* Update ItemTurret.java

* Update LiquidTurret.java
 2023-01-13 16:51:36 -05:00
Anuken 00d6b0d483 Merge remote-tracking branch 'origin/master' 2023-01-13 09:59:05 -05:00
Anuken 598049265a Complete revert of #8019 2023-01-13 09:59:01 -05:00
NuntingandGitHub c3209f2cdd Update bundle_ko.properties (#8171) 2023-01-13 09:44:08 -05:00
Anuken b2b4602c91 Reverting #8037 2023-01-13 09:42:28 -05:00
Anuken b1e1fe4922 Merge remote-tracking branch 'origin/master' 2023-01-13 09:31:14 -05:00
Anuken edcf3c4223 Fixed #8170 2023-01-13 09:31:10 -05:00
Github Actions 58315acfa3 Automatic bundle update 2023-01-13 03:53:33 +00:00
Anuken ec9eadd660 encoding test 2023-01-12 22:52:32 -05:00
Anuken 7277892e33 Merge remote-tracking branch 'origin/master' 2023-01-12 17:01:52 -05:00
Anuken 54962a158d Fixed #8168 2023-01-12 17:01:47 -05:00
Даркнесс#3729andGitHub 30dcbe1af3 Administration improvements (#8167) 
* Administration improvements

Reduced the interval for preventing sending the same message because 50 seconds is too much and kinda confusing
Added saving and loading kicked IPs so they are saved even when the server crashes
Fixed smth in Config

* skill issue
 2023-01-12 16:24:51 -05:00
Anuken 411367f294 Revert JSON rules change 2023-01-12 14:38:11 -05:00
Anuken f49e05a915 Fixed #8161 / Fixed #8162 2023-01-12 14:30:57 -05:00
Anuken 53e8eaae75 Further scathe uncover range nerf 2023-01-12 11:36:13 -05:00