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,310 Commits 1 Branch 0 Tags 64 MiB
4e7ae6c5b0
Commit Graph

480 Commits

Author SHA1 Message Date
Daniel Walsh
ab477b412f
Push my WIP changes 2021-12-01 13:08:08 +00:00
Renovate Bot
96fdd47a5c
Update dependency com.konghq:unirest-java to v3.13.4 2021-11-20 16:18:47 +00:00
Renovate Bot
c5285e5bfc
Update dependency org.mockito:mockito-core to v4.1.0 2021-11-19 18:52:47 +00:00
Renovate Bot
577ee33cb3
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.9.1.2184 2021-11-09 14:46:09 +00:00
Daniel Walsh
5a8645550b
[CI Skip] Merge pull request #3334 from Slimefun/renovate/com.konghq-unirest-java-3.x 2021-11-06 20:53:00 +00:00
Renovate Bot
a8c0b17fc5
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.21 2021-11-03 16:04:50 +00:00
Renovate Bot
ca2347cabd
Update dependency com.konghq:unirest-java to v3.13.3 2021-11-01 15:35:33 +00:00
TheBusyBiscuit
1ef99aac68
[CI skip] Merge pull request #3331 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.20
 2021-10-28 13:04:39 +02:00
Daniel Walsh
52cec21e29
[CI Skip] Merge pull request #3327 from Slimefun/renovate/com.konghq-unirest-java-3.x 2021-10-28 02:21:00 +01:00
Renovate Bot
a0767b034c
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.20 2021-10-25 15:31:24 +00:00
Daniel Walsh
b8f7dc5d7b
[CI Skip] Merge pull request #3329 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 2021-10-25 10:14:18 +01:00
Renovate Bot
863de0ad72
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.7 2021-10-24 14:32:49 +00:00
Renovate Bot
36a6f65012
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.7 2021-10-24 14:32:45 +00:00
Renovate Bot
b51d7c0f88
Update dependency com.konghq:unirest-java to v3.13.2 2021-10-23 12:54:33 +00:00
Renovate Bot
c82e02db43
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.8 2021-10-12 11:51:49 +00:00
Renovate Bot
74dc110ac8
Update dependency org.mockito:mockito-core to v4 2021-10-07 15:30:57 +00:00
Renovate Bot
699dd9899a
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.202 2021-10-05 19:59:21 +00:00
Renovate Bot
80dc5a5e51
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.2 2021-09-24 08:11:24 +00:00
Renovate Bot
f89e9d4ebd
Update dependency org.junit.jupiter:junit-jupiter to v5.8.1 2021-09-22 20:21:04 +00:00
TheBusyBiscuit
7ae0128ff6
[CI skip] Merge pull request #3250 from Slimefun/renovate/junit5-monorepo 
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0
 2021-09-14 11:53:50 +02:00
Renovate Bot
3310897403
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0 2021-09-12 19:30:37 +00:00
Renovate Bot
dcfb399b3d
Update dependency com.konghq:unirest-java to v3.13.0 2021-09-12 16:17:39 +00:00
TheBusyBiscuit
1e5c32cf52
[CI skip] Merge pull request #3242 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x 
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1
 2021-09-09 12:37:23 +02:00
Renovate Bot
312db84e47
Update dependency com.konghq:unirest-java to v3.12.0 2021-09-08 21:39:58 +00:00
Renovate Bot
8913e2e3b1
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 2021-09-07 19:20:33 +00:00
Renovate Bot
94da02e0e6
Update dependency io.github.baked-libs:dough-api to v1.0.3 2021-09-06 08:57:32 +00:00
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