mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
7,150 Commits 1 Branch 0 Tags 64 MiB
fd2b8d0578
Commit Graph

454 Commits

Author SHA1 Message Date
Daniel Walsh
d64f2bba3f
Merge branch 'master' into breaking-changes/class-relocation 2021-09-01 21:03:22 +01:00
Renovate Bot
85f62a6688
Update dependency com.konghq:unirest-java to v3.11.13 2021-08-27 16:53:12 +00:00
Renovate Bot
9178fa7505
Update dependency org.mockito:mockito-core to v3.12.4 2021-08-25 21:28:35 +00:00
Daniel Walsh
d3bde94a7d
[CI Skip] Merge pull request #3210 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6
 2021-08-22 11:13:15 +01:00
Renovate Bot
51681529ab
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.6 2021-08-22 05:08:57 +00:00
Renovate Bot
62e6b517a6
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6 2021-08-22 05:08:54 +00:00
Renovate Bot
7ba7f9342a
Update dependency org.mockito:mockito-core to v3.12.1 2021-08-20 15:56:59 +00:00
Renovate Bot
be69814f75
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.201 2021-08-10 22:16:12 +00:00
TheBusyBiscuit
c0f25ba5ec Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/McMMOIntegration.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java
 2021-08-05 15:08:54 +02:00
Renovate Bot
11fb4a47cc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.7 2021-08-03 15:31:25 +00:00
TheBusyBiscuit
708aa17340 Bump dough-api to 1.0.2 2021-07-28 14:33:44 +02:00
TheBusyBiscuit
633a736016 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/FlexCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/MultiCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
 2021-07-28 14:32:27 +02:00
TheBusyBiscuit
1f4a97aa5c
Merge pull request #3134 from NgLoader/master 
Intregation: Orebfuscator
 2021-07-26 12:51:31 +02:00
TheBusyBiscuit
1fbfa63507 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java
 2021-07-26 00:12:45 +02:00
Renovate Bot
33405d90bc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.6 2021-07-23 15:29:46 +00:00
TheBusyBiscuit
6175540a4e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into breaking-changes/class-relocation 2021-07-15 17:29:43 +02:00
TheBusyBiscuit
ddd2d21245 Finished first transition to dough 2021-07-15 14:24:24 +02:00
Renovate Bot
5c0775e4c6
Update dependency com.konghq:unirest-java to v3.11.12 2021-07-14 20:43:07 +00:00
TheBusyBiscuit
91c6e869a5 Updated group id of baked-libs 2021-07-14 17:41:26 +02:00
TheBusyBiscuit
0cc9bd91de Progress towards dough 2021-07-14 16:47:41 +02:00
Renovate Bot
795a4c02db
Update dependency me.clip:placeholderapi to v2.10.10 2021-07-10 05:05:25 +00:00
Renovate Bot
03e10830d1
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.0 2021-07-08 18:59:52 +00:00
Renovate Bot
d2befd0b16
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.200 2021-07-02 04:11:41 +00:00
Renovate Bot
a84b634db8
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.32.1 2021-06-27 12:10:21 +00:00
Renovate Bot
139caf05d7
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.3.2 2021-06-24 19:58:14 +00:00
NgLoader
9919549c7e Merge branch 'master' of github.com:NgLoader/Slimefun4 2021-06-21 21:15:38 +02:00
NgLoader
282f9e0e43 feat: added orebfuscator integration 2021-06-21 21:13:49 +02:00
Renovate Bot
7703c80bd9
Update dependency org.mockito:mockito-core to v3.11.2 2021-06-21 15:55:11 +00:00
Renovate Bot
d0426d517d
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.3.0 2021-06-19 21:31:51 +00:00
Renovate Bot
4d7936969f
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.199 2021-06-15 22:26:09 +00:00
TheBusyBiscuit
aa5a22cb16
Merge pull request #3112 from Slimefun/major/mc-1-17 
WIP - 1.17 support
 2021-06-12 12:09:18 +02:00
Renovate Bot
94675d6e85
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.198 2021-06-11 21:30:47 +00:00
Renovate Bot
ff6c5ed1aa
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.32.0 2021-06-11 14:53:22 +00:00
Daniel Walsh
36727688cc
REEEE 2021-06-11 15:32:28 +01:00
Daniel Walsh
2513b71e6f
Final changes 2021-06-11 15:30:20 +01:00
Daniel Walsh
1e1889b66d
Goats can produce milk 2021-06-11 13:33:21 +01:00
Renovate Bot
94e1bbbf8d
Update dependency org.mockito:mockito-core to v3.11.1 2021-06-11 11:05:27 +00:00
Daniel Walsh
eb4c6aa22b
1.17 support 2021-06-11 11:19:43 +01:00
Renovate Bot
4ce91bc794
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.197 2021-06-07 04:30:44 +00:00
Renovate Bot
8e18548ff7
Update dependency org.mockito:mockito-core to v3.11.0 2021-06-03 15:11:57 +00:00
Renovate Bot
805b072bb8
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.1.0 2021-05-27 19:38:11 +00:00
Renovate Bot
769d299204
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0 2021-05-22 12:46:10 +00:00
Renovate Bot
bee1abf859
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.0.1 2021-05-20 19:58:31 +00:00
Renovate Bot
986d6ae15d
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.8 2021-05-20 15:12:44 +00:00
Renovate Bot
452f262e38
Update dependency org.junit.jupiter:junit-jupiter to v5.7.2 2021-05-15 13:51:29 +00:00
Renovate Bot
20a5031ca7
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1 2021-05-13 18:34:06 +00:00
Renovate Bot
fbd3bb1eac
Update dependency org.mockito:mockito-core to v3.10.0 2021-05-12 11:23:20 +00:00
TheBusyBiscuit
8a8b8ce577
Merge pull request #3015 from Slimefun/performance/networks 
Improved memory usage of cargo/energy networks and fixed #3013
 2021-05-10 18:44:01 +02:00
TheBusyBiscuit
81223004bf Default values for item models are now read from a resource file. 2021-05-08 19:22:54 +02:00
TheBusyBiscuit
dc34ec8dfc
Merge branch 'master' into performance/networks 2021-05-07 14:15:30 +02:00