mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,676 Commits 4 Branches 160 Tags 2.3 GiB
09d00b30e9
Commit Graph

16676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
09d00b30e9 Fixed incorrect consumption rate in booster stats 2023-07-29 09:51:58 -04:00
Anuken
f3656d24d4 Merge remote-tracking branch 'origin/master' 2023-07-29 00:22:08 -04:00
Anuken
1968da9409 Fixed #8861 2023-07-29 00:22:01 -04:00
MEEPofFaith
0d8c07d007
Bullet despawn unit shenanigans (#8859) 
* Proper despawn unit direction

* Despawn unit chance

* Merge if statements
 2023-07-28 23:55:20 -04:00
OSP
0e83300548
ToxoFlame attack server (#8858) 2023-07-28 16:42:28 -04:00
Anuken
ba9e39d7a4 Fixed #8856 2023-07-28 09:07:50 -04:00
Anuken
d4111b8e76 Fixed #8854 2023-07-27 23:40:48 -04:00
Anuken
2bae95d2a8 Merge remote-tracking branch 'origin/master' 2023-07-27 15:48:41 -04:00
Anuken
69377bab3f Fixed #8849 2023-07-27 15:48:32 -04:00
tech3mi
2fc69c4f64
Update servers_v7.json (#8846) 2023-07-26 10:42:12 -04:00
Anuken
dae23c7fe6 Merge remote-tracking branch 'origin/master' 2023-07-26 10:31:24 -04:00
Anuken
7850e61672 Misc bugfixes 2023-07-26 10:31:18 -04:00
Tomoko
24c01f97d3
Rename my server and change ips (#8845) 2023-07-26 09:59:30 -04:00
BalaM314
a92bce2c14
Expose NetServer currentlyKicking for plugin access (#8817) 
* Expose NetServer currentlyKicking for plugin access

* Move code around

* Un-final

* currentlyKicking no longer needs a wrapper array
 2023-07-26 01:44:20 -04:00
MEEPofFaith
e5ded1f2dd
Allow fluid type configuration for ConsumeCoolant (#8841) 
* Allow fluid type configuration for ConsumeCoolant

* Methods
 2023-07-25 21:47:46 -04:00
Anuken
dc8783d4a6 Legacy blocks must not be logic constants 2023-07-25 21:10:21 -04:00
Anuken
0ef5255650 Fixed #8840 2023-07-25 21:04:47 -04:00
Anuken
a922932a56 ??? 2023-07-25 12:14:22 -04:00
Anuken
3fd5f52545 Fixed #8837 2023-07-25 12:14:15 -04:00
Anuken
f976a294ce Merge remote-tracking branch 'origin/master' 2023-07-25 11:08:14 -04:00
Anuken
6f725d320b Fixed #8838 2023-07-25 11:08:08 -04:00
StalkerBaran
51b974f10e
Update servers_v7.json (#8836) 2023-07-25 10:05:07 -04:00
KhanhLamVirual
447e07420e
Update servers_v7.json (#8828) 
I want to add a new vndustry server
 2023-07-24 00:19:22 -04:00
Lime712
dbbcf4b168
German Translation (#8761) 
* Update bundle_de.properties

English description in German bundle

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties
 2023-07-23 16:32:47 -04:00
Joan Josep
f3dd031d0e
Update bundle_ca.properties (#8823) 2023-07-23 16:31:00 -04:00
Anuken
4998abfe01 Merge remote-tracking branch 'origin/master' 2023-07-23 16:30:49 -04:00
Anuken
636ce4ca94 Better implementation of #8810 2023-07-23 16:30:44 -04:00
Mythril382
bfdd7ecc3a
the camper (#8806) 2023-07-23 16:28:50 -04:00
nowords123
28372b0f47
added new phoenix server (#8801) 
Hi, I'm words an admin from phoenix
I added a new phoenix server under the ip

phoenix-network.dev:2023
 2023-07-23 16:27:46 -04:00
MEEPofFaith
b4e03b46f6
Destroy bullet team (#8792) 
* Option for destroy bullet to be on the block's team

* Random direction

* h
 2023-07-23 16:27:11 -04:00
Lanark53
16949f1e69
toxoflame server (#8790) 2023-07-23 16:26:35 -04:00
Даркнесс#3729
b272008a90
Update EntityGroup.java (#8802) 2023-07-23 16:26:17 -04:00
NazrinNya
cc8d2b6a0c
Update servers_v7.json (#8825) 2023-07-23 16:24:47 -04:00
Anuken
10fe6b9007 Fixed #8830 2023-07-23 16:07:53 -04:00
Anuken
ce43af9091 Fixed #8827 2023-07-23 15:59:19 -04:00
Anuken
788fa66a91 Fixed #8819 2023-07-23 15:56:36 -04:00
Anuken
fedad1e0d0 Fixed #8813 2023-07-23 15:49:12 -04:00
Anuken
a14149c952 Fixed #8807 2023-07-23 15:45:48 -04:00
Anuken
053afcace9 Fixed #8795 2023-07-23 15:43:04 -04:00
Anuken
e097346a73 Fixed #8794 2023-07-23 15:36:34 -04:00
Anuken
4076f09573 Fixed #8789 2023-07-23 15:22:52 -04:00
Anuken
e78fb11c48 Merge remote-tracking branch 'origin/master' 2023-07-23 15:19:31 -04:00
Anuken
135874b922 Fixed #8787 2023-07-23 15:19:21 -04:00
Epowerj
09aa68fdb2
Merge pull request #8805 from SSTentacleSS/patch-17 
Update servers_v7.json
 2023-07-22 01:03:36 -04:00
Tentyanuk
dd5037d9d2
Update servers_v7.json 2023-07-22 07:43:35 +03:00
Epowerj
418d533c3c
Merge pull request #8800 from TheRadioactiveBanana/patch-6 
Removal of dead ips and slight ip change
 2023-07-20 23:56:29 -04:00
Epowerj
37e138858b
Merge pull request #8824 from thedimas3007/patch-8 
Update servers_v7.json
 2023-07-18 18:34:19 -04:00
thedimas
b6a195cc80
Update servers_v7.json 2023-07-18 22:32:34 +02:00
Tentyanuk
4b4033e9e7
Update servers_v7.json 2023-07-08 22:49:10 +03:00
TheRadioactiveBanana
383d8b89e7
Forgot an ip 2023-07-07 16:35:33 +05:30