16441 Commits
Author SHA1 Message Date
Anuken 1630e1a7fb Asteroid gen progress 2021-06-22 14:22:31 -04:00
Patrick 'Quezler' MounierandGitHub 42c643f769 Fix ammo multiplier exception in itemturret (#5446) 2021-06-22 13:35:28 -04:00
Volas171andGitHub b7d5f9a7ab Add Mindustry Reborn to v7 and v6 ServerList (#5444)
* reborn v6

* v7 reborn lol

* yikes
2021-06-22 10:33:38 -04:00
Anuken b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken ff3940865e A. 2021-06-21 19:35:00 -04:00
Darkness6030andGitHub 7e7d6120ad Update mindurka ip (again) (#5443)
Sry, anuke
2021-06-21 14:16:44 -04:00
Anuken 4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken 448d1e2c77 Cleanup 2021-06-20 09:50:25 -04:00
Anuken d6566830ac Ignore Discord RPC exceptions 2021-06-20 08:48:05 -04:00
Anuken 5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken b7b9d48d1e Cleanup 2021-06-19 21:31:37 -04:00
Anuken 3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken ca60309fde Asteroid generator progress 2021-06-19 11:17:52 -04:00
Anuken 8f6365015a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	gradle.properties
2021-06-18 18:40:02 -04:00
Anuken 12dfd71345 Minor load markup fix 2021-06-18 15:44:35 -04:00
Anuken 60b6e93f7c arc 2021-06-18 15:25:40 -04:00
Anuken 128174faa4 NOTHING 2021-06-18 15:19:28 -04:00
Anuken 7ab0c86978 Stencil buffer fallback 2021-06-18 15:14:08 -04:00
Anuken 5f0ec79b0f Fixed crash logs sometimes not saving 2021-06-18 09:33:12 -04:00
Anuken 5d8f6d7c97 More environmental support 2021-06-18 09:31:28 -04:00
Anuken b77b89abfb More environmental support 2021-06-17 14:34:57 -04:00
Anuken 23ced8d006 aa 2021-06-17 11:10:39 -04:00
Anuken 016e5ab97e Env rules for many various blocks 2021-06-17 11:08:01 -04:00
Anuken afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
2021-06-17 10:44:51 -04:00
Anuken 15affaad9b Cleaner impact reactor explosion 2021-06-16 16:53:09 -04:00
MEEP of FaithandGitHub a74bc0c077 block destroyEffect (#5427) 2021-06-16 15:55:08 -04:00
Anuken 9088d9eb39 Polygonal protection bugfixes 2021-06-16 15:07:14 -04:00
Anuken f11f390c1f Polygonal protection for built-in PvP maps 2021-06-16 14:51:37 -04:00
Anuken 865ee952c9 WIP polygonal core protection 2021-06-16 13:26:18 -04:00
Anuken efcae883fb Experimental core-capture PvP map / Editor filter fixes 2021-06-16 11:09:18 -04:00
Anuken c623e66694 hhhh 2021-06-15 19:32:06 -04:00
Anuken 97729fd659 Stateless simplex (2) 2021-06-15 19:31:51 -04:00
Anuken eed91eaaa0 # Conflicts:
#	core/src/mindustry/mod/ClassMap.java
2021-06-15 19:29:12 -04:00
Anuken fe9ff212b2 Stateless simplex 2021-06-15 19:28:54 -04:00
Anuken 210fb349de Less editor filter state 2021-06-15 12:26:00 -04:00
Anuken 69d8af7874 Editor filter seed saving & cleanup 2021-06-15 11:58:26 -04:00
Anuken 183c922b6b Do not save MirrorFilter temporary vectors 2021-06-15 11:32:49 -04:00
Anuken 964104db65 Merge remote-tracking branch 'origin/master' 2021-06-15 09:39:27 -04:00
Anuken 2d8f7cb680 Fixed #5425 2021-06-15 09:39:23 -04:00
Volas171andGitHub aef92fd3b0 remove mindustrypvp.ml (#5423)
we are leaving the list for the following reasons : 
we are renewing domain
coming back later (having some stability issue in moderation)
2021-06-14 23:24:26 -04:00
Anuken a0f80a8865 it is solved 2021-06-14 11:35:53 -04:00
Anuken 6b5a743583 confusion 3 2021-06-14 11:33:00 -04:00
Anuken 28252173b4 confusion 2 2021-06-14 11:32:46 -04:00
Anuken 2e733273a0 confusion 2021-06-14 11:28:28 -04:00
Anuken 39f4e90fff s t o p 2021-06-14 11:23:47 -04:00
Anuken 22d1700fb2 JITPack appears to be throwing a fit (2) 2021-06-14 11:22:56 -04:00
Anuken 31c39e0148 JITPack appears to be throwing a fit 2021-06-14 11:15:06 -04:00
Anuken e5b80c37eb Renamed misleading github jobs 2021-06-14 11:05:37 -04:00
Anuken 2a451aa41f Disable preview features 2021-06-14 10:59:38 -04:00