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,560 Commits 1 Branch 0 Tags 64 MiB
9387f28446
Commit Graph

524 Commits

Author SHA1 Message Date
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
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
TheBusyBiscuit
a4aebf7bcd [CI skip] Translators are now read from a json file. 
Next step is writing a GitHub action that auto-populates that file via
the Crowdin API
 2021-05-06 15:56:55 +02:00
TheBusyBiscuit
8a1eba8fd4 [CI skip] Crowdin setup (squashed) 2021-05-05 18:10:02 +02:00
TheBusyBiscuit
ff8e630dec Fixed group id for mcmmo 2021-05-03 15:29:47 +02:00
Renovate Bot
0ceaf905f0
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.31.0 2021-05-03 13:24:57 +00:00
TheBusyBiscuit
399359ae25 Reduced memory usage for networks and enforce world limitation 2021-05-03 15:19:33 +02:00
Renovate Bot
f7d787295d
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.2 2021-04-29 20:07:09 +00:00
Renovate Bot
7b58127619
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.9.0.2155 2021-04-29 15:00:57 +00:00
Rothes
205f8d02b1
Merge branch 'master' into master 2021-04-26 12:28:03 +08:00
Renovate Bot
f7e5aa33b3
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.3 2021-04-23 22:01:22 +00:00
TheBusyBiscuit
d0a7ad7aea Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-04-23 20:48:29 +02:00
TheBusyBiscuit
1c5372d261 Complete restructure of language files 2021-04-23 20:48:24 +02:00
Renovate Bot
e323903a36
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.196 2021-04-23 18:39:42 +00:00
TheBusyBiscuit
3ad981aa1e Fixed shading of libraries 2021-04-23 19:29:01 +02:00
TheBusyBiscuit
1982ec0aeb Reorganized language files 2021-04-23 19:22:25 +02:00
TheBusyBiscuit
371a8b5f52 Restored pom.xml 2021-04-21 11:50:37 +02:00
TheBusyBiscuit
6141bb9fd5 Merge branch 'master' of https://github.com/Slimefun/Slimefun4 2021-04-21 11:49:09 +02:00
Rothes
b729e14ec4
Update pom.xml 2021-04-21 17:46:13 +08:00
Rothes
f12b2a0ba7
Update pom.xml 2021-04-21 17:44:52 +08:00
TheBusyBiscuit
28137be764
[CI skip] Merge pull request #2975 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5
 2021-04-21 10:17:25 +02:00
Renovate Bot
f3565a6556
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.5 2021-04-21 04:08:29 +00:00
Renovate Bot
aa314d4e41
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5 2021-04-21 04:08:25 +00:00
Renovate Bot
98fa7c180a
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.1 2021-04-20 07:55:46 +00:00
Renovate Bot
1a53db1e14
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.195 2021-04-19 20:41:07 +00:00
Renovate Bot
da9d0467c5
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.194 2021-04-19 01:30:37 +00:00
Renovate Bot
50bc7525e0
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193 2021-04-16 17:43:23 +00:00
Renovate Bot
f547a7dad2
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192 2021-04-15 22:03:54 +00:00
Renovate Bot
cc6eac8d33
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.190 2021-04-15 02:50:11 +00:00
Renovate Bot
8b606766dc
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.30.4 2021-04-08 18:12:25 +00:00
Renovate Bot
2053b4d907
Update dependency org.mockito:mockito-core to v3.9.0 2021-04-07 14:24:34 +00:00
Renovate Bot
90cb7101ba
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.188 2021-04-05 22:06:28 +00:00