1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

437 Commits

Author SHA1 Message Date
TheBusyBiscuit
1f4a97aa5c
Merge pull request #3134 from NgLoader/master
Intregation: Orebfuscator
2021-07-26 12:51:31 +02:00
Renovate Bot
33405d90bc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.6 2021-07-23 15:29:46 +00:00
Renovate Bot
5c0775e4c6
Update dependency com.konghq:unirest-java to v3.11.12 2021-07-14 20:43:07 +00: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