Commit Graph

17015 Commits

Author SHA1 Message Date
The1Crux
2b1557832d
Update servers_v7.json (#9037)
sorry i forgot this ip in last fork
2023-09-09 15:52:16 -04:00
alex
3686f1c058
Update servers_v7.json (#9033)
change to ip address
2023-09-08 00:27:43 -04:00
Anuken
b9f2da7286 Merge remote-tracking branch 'origin/master' 2023-09-07 09:23:22 -04:00
Anuken
a47e4518fe Fixed #9031 2023-09-07 09:23:17 -04:00
DVD
d0e3a691d1
Update servers_v7.json (#9028)
* Update servers_v7.json

Idk if i need to write description, but i will. My server is about pvp in open world, that generates every round again. Also there are serpulo and erekir content, that balanced not bad.

* Update servers_v7.json

Fixed ad(d)ress
2023-09-06 10:55:20 -04:00
WayZer
c9beb3d158
add @server to logic (#9018)
* add @master to logic

* remove `Vars.`

* Update GlobalVars.java

* Update GlobalVars.java
2023-09-05 12:43:17 -04:00
Anuken
7fa002c626 Support for JSON planets without a parent 2023-09-05 09:41:04 -04:00
Anuken
fb3fff40d2 Merge remote-tracking branch 'origin/master' 2023-09-04 17:56:16 -04:00
Anuken
ee5fc8a332 Crash fix 2023-09-04 17:56:10 -04:00
HamzaGSopp
4a48115c0a
Update servers_v7.json (#9019) 2023-09-04 16:59:19 -04:00
Anuken
d54f7acceb e 2023-09-04 11:29:08 -04:00
Anuken
d2de8e7880 2023-09-04 11:28:34 -04:00
Anuken
424714972c fixed #9017 2023-09-04 10:05:39 -04:00
Anuken
700dd38a36 Fixed #9011 2023-09-04 00:04:22 -04:00
Anuken
a4b1ad3b67 Fixed monos not mining 2023-09-03 23:50:38 -04:00
Anuken
3ce71aa891 Fixed mod loading 2023-09-03 22:45:37 -04:00
Anuken
26b66f9bdb Fixed empty admin menu 2023-09-03 22:02:02 -04:00
Anuken
5548e72750 I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN I HATE THE ANDROID GRADLE PLUGIN V 2023-09-03 21:52:25 -04:00
Anuken
766a95da03 Build fix? 2023-09-03 21:15:50 -04:00
Anuken
c705743696 Merge remote-tracking branch 'origin/master' 2023-09-03 21:12:52 -04:00
Anuken
0e24b67d09 Wave effect has color now 2023-09-03 21:12:46 -04:00
Zerenta
9d8905a4ae
fixes serp-specific fog issue (#9009)
* fixes serp-specific fog issues

* didnt know the f had a purpose
2023-09-03 21:08:31 -04:00
Anuken
2882f7840e Merge remote-tracking branch 'origin/master' 2023-09-03 13:28:33 -04:00
Anuken
73dd487af9 Updated Gradle + other deps 2023-09-03 13:28:11 -04:00
SSansssssssssssss
798b493334
Update servers_v7.json (#9006) 2023-09-03 11:39:13 -04:00
Anuken
8311261e3c Merge remote-tracking branch 'origin/master' 2023-09-03 11:37:49 -04:00
Anuken
26c54ae0ed Removed pointless test 2023-09-03 11:37:43 -04:00
Hahaa13
6341da8f43
Update servers_v7.json (#9002) 2023-09-02 19:53:47 -04:00
Github Actions
f0e272d84c Automatic bundle update 2023-09-02 23:18:45 +00:00
Anuken
9c23134f2a Merge remote-tracking branch 'origin/master' 2023-09-02 19:17:53 -04:00
Anuken
d3b7fb0990 Fixed #9001 2023-09-02 19:17:47 -04:00
HamzaGSopp
90ed5f2750
Update servers_v7.json (#8996) 2023-09-02 11:59:23 -04:00
Anuken
e07ab5cef6 Merge remote-tracking branch 'origin/master' 2023-09-02 11:49:41 -04:00
Anuken
2e1b4934ad Added setting to disable lighting 2023-09-02 11:49:34 -04:00
Github Actions
91964da088 Automatic bundle update 2023-09-02 13:20:23 +00:00
nullevoy
cc66ccb49f
most ability displays (#8981)
* works

* why not

* idk if that changes it but

* json

* destringening

* automatic imports and leftover marker

* uirfirf
2023-09-02 09:19:32 -04:00
Anuken
bff4097c88 Merge remote-tracking branch 'origin/master' 2023-09-01 14:24:17 -04:00
Anuken
996cbefb4f Fixed #8993 2023-09-01 14:24:11 -04:00
Darkness
579d63ac23
Update TraceDialog.java (#8992) 2023-08-31 17:23:23 -04:00
Github Actions
6a53a0e7be Automatic bundle update 2023-08-30 13:06:00 +00:00
Darkness
4edf4cac25
Add language to trace info (#8990)
* Update Administration.java

* im stoopid

* Update TraceDialog.java

* Update bundle.properties
2023-08-30 09:05:05 -04:00
Anuken
68141798d3 Merge remote-tracking branch 'origin/master' 2023-08-29 17:51:53 -04:00
Anuken
e3b815a4c6 Possible corner death fix 2023-08-29 17:51:45 -04:00
zeutd
57d000f767
let DrawRegion drawer can draw regions rotate with building rotation (#8987)
* let DrawRegion drawer can draw regions that rotate with building rotation

create a variable buildingRotate that can select whether the region will rotate with building rotation or not

* let DrawRegion drawer can draw regions rotate with building rotation

create a variable buildingRotate that can select whether the region will rotate with building rotation or not
make modders needn't to use DrawSideRegion to make this effect

* Update DrawRegion.java
2023-08-29 09:10:46 -04:00
alex
3ac9ae29ee
removal of alex V6 servers (#8983)
V6 servers no longer functioning :(
2023-08-28 12:20:18 -04:00
Github Actions
3942445d1f Automatic bundle update 2023-08-27 15:39:50 +00:00
Anuken
16223af87d Fixed #8978 2023-08-27 11:39:05 -04:00
Anuken
109ba84625 Don't allow loaders to accept items/liquids from unloaders 2023-08-26 22:32:43 -04:00
Anuken
ec80fe9aad Merge remote-tracking branch 'origin/master' 2023-08-25 22:48:22 -04:00
Anuken
680fc34ac3 Reverted building explosion nerf completely 2023-08-25 22:48:16 -04:00