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
8,143 Commits 1 Branch 0 Tags 64 MiB
4a0f76d275
Commit Graph

5805 Commits

Author SHA1 Message Date
TheBusyBiscuit
7274436ca1 Deprecated the "Hercules Pickaxe" 2022-07-10 11:11:15 +02:00
TheBusyBiscuit
2813e76075 Fixed #3573 2022-07-10 10:59:23 +02:00
TheBusyBiscuit
5200823b4e
Merge branch 'master' into java16 2022-07-09 21:07:18 +02:00
TheBusyBiscuit
1948858ccd
Merge pull request #3503 from J3fftw1/fix/bee-wings 
Fix bee wings erroring on startup
 2022-07-09 21:00:53 +02:00
TheBusyBiscuit
bcc606cb9d
Merge pull request #3607 from J3fftw1/feature/wool_carpets_tag 
added wool tag
 2022-07-09 20:44:39 +02:00
TheBusyBiscuit
1851332222
Merge pull request #3492 from J3fftw1/feature/new-glass 
added tinted glass
 2022-07-09 20:44:30 +02:00
Sefiraat
6be38d68ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-07-09 20:19:28 +02:00
Sefiraat
eaa806d079 Feedback 2022-07-08 22:06:02 +01:00
Sefiraat
be7e4edff3 Docs 2022-07-06 12:24:59 +01:00
Sefiraat
1d74866863 Allow addons to disable warning 2022-07-06 12:16:33 +01:00
Jeffrey Kosse
2f2f031b8e forget the # 2022-07-06 11:55:25 +02:00
Jeffrey Kosse
5ab92f4111 moved the tag to be with other slimefun tags 2022-07-06 11:43:51 +02:00
Jeffrey Kosse
f516144ab6 added wool tag 2022-07-06 11:40:08 +02:00
J3fftw
5414c284fa
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2022-07-03 23:04:37 +02:00
TheBusyBiscuit
06bd9873d9 Cleaned up some more code smells 2022-07-03 12:21:49 +02:00
Sefiraat
82e141cf09 Cookie is making me work for my lunch 2022-07-03 10:36:12 +01:00
Sefiraat
affa3af06c Merge remote-tracking branch 'origin/java16' into java16 2022-07-02 23:46:09 +01:00
Sefiraat
5f525fbf74 Java16 Sonar Changes - 8 (done again) 2022-07-02 23:44:39 +01:00
Sefiraat
809530fccd Apply suggestions from code review - 2 2022-07-02 23:39:53 +01:00
Sefiraat
d15e02afbc Merge remote-tracking branch 'upstream/java16' into java16 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
 2022-07-02 23:39:38 +01:00
Sefiraat
58fde5cbdf
Apply suggestions from code review - 1 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-07-02 23:39:05 +01:00
TheBusyBiscuit
e80f137a79
Merge branch 'java16' into java16 2022-07-03 00:00:07 +02:00
Sefiraat
30e9c879e0 Java16 Sonar Changes - 7 (done) 2022-07-02 22:09:05 +01:00
Sefiraat
dbf55be230 Java16 Sonar Changes - 6 2022-07-02 21:51:08 +01:00
Sefiraat
75375cef45 Remove CT from classifyLocation() 2022-07-02 21:37:15 +01:00
Sefiraat
9f4cb828cb Java16 Sonar Changes - 5 2022-07-02 21:36:15 +01:00
Sefiraat
0f6b6b244c Java16 Sonar Changes - 4 2022-07-02 21:31:03 +01:00
Sefiraat
cd9920b181 Java16 Sonar Changes - 3 2022-07-02 21:13:50 +01:00
Sefiraat
f32dfa4d76 Java16 Sonar Changes - 2 2022-07-02 21:03:20 +01:00
Sefiraat
b4bd9d7acf Java16 Sonar Changes 2022-07-02 20:51:14 +01:00
TheBusyBiscuit
bb9e2dfa4a Impelemented a few instanceof patterns, actually quite nice :) 2022-07-02 21:43:16 +02:00
TheBusyBiscuit
20c3564e8f Initial update to Java 16 2022-07-02 20:49:00 +02:00
JasperChaseTOQ
ad3030c39c
Update src/main/resources/tags/dirt_variants.json 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-06-23 18:32:20 -04:00
JasperChaseTOQ
68739d87a1
Update dirt_variants.json 2022-06-22 22:33:51 -04:00
TheWireLord
583d69ea78 Added Glow Berries Being Useful 
+ Added Glow Berry Juice as a result of using Glow Berries in the Juicer.
+ Added Glow Berries as a fuel in the Bio Reactor.
+ Updated Wiki.
 2022-06-17 16:29:25 -04:00
JasperChaseTOQ
bff4ca91c0
Update SlimefunItems.java 2022-06-11 20:52:28 -04:00
TheBusyBiscuit
c05420565d Added test cases for 1.19 biome maps 2022-06-11 13:07:17 +02:00
TheBusyBiscuit
cea6980368 Fixed biome-map for 1.19 2022-06-11 13:07:07 +02:00
Jeffrey Kosse
f8b44cb63f removed illegal values 2022-06-07 22:17:55 +02:00
Jeffrey Kosse
eb8fa9c522 fixed tests 2022-06-07 22:07:52 +02:00
Jeffrey Kosse
fb5a20c603 updated to 1.19 2022-06-07 21:55:18 +02:00
TheBusyBiscuit
f431aa6dca
Merge pull request #3427 from Slimefun/chore/yeet-chestterminal 
Removed ChestTerminal support
 2022-04-29 12:26:40 +02:00
TheBusyBiscuit
949eb48fbc
[CI skip] Removed CT as a loadbefore 2022-04-29 12:26:20 +02:00
TheBusyBiscuit
5cfc4f725e Fixed #3548 2022-04-25 18:12:02 +02:00
TheBusyBiscuit
7a2347a027
Merge pull request #3546 from craftish37/master 
Added Seagrass recipe (suggestion #398 from Mr.Moules)
 2022-04-24 19:26:23 +02:00
craftish37
76444df8f5
Formatting 
Co-authored-by: Varian Anora <variananora@outlook.com>
 2022-04-22 16:31:27 +02:00
craftish37
1a5c3f024f Forgot to use my damn brain 
(Also added Seagrass Fertilizer)
 2022-04-22 16:02:21 +02:00
craftish37
3021a8efa9
Added Seagrass recipe (suggestion #398 from Mr.Moules) 2022-04-22 15:19:38 +02:00
itslukemango
7f70570260
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-04-22 12:11:27 +01:00
=
ec79423123 Fix Arithmetic Error 2022-04-20 22:45:04 +01:00
TheBusyBiscuit
217196c137 Fixed #3534 2022-04-19 20:51:13 +02:00
TheBusyBiscuit
429ff50624 Fixed #3504 2022-04-08 18:02:45 +02:00
Jeffrey Kosse
30386fbcb5 did requested changes 2022-04-05 19:34:06 +02:00
Jeffrey Kosse
15dce08769 fixed error on startup 2022-03-22 07:35:13 +01:00
TheBusyBiscuit
020094e04e Fixed unit tests 2022-03-20 11:38:20 +01:00
TheBusyBiscuit
d3cf518f74 Refactored ItemGroups 2022-03-20 11:21:27 +01:00
Jeffrey Kosse
8043261da7 added freezer 3 2022-03-19 17:44:58 +01:00
qwertyuioplkjhgfd
d2d4dd54d5
comments and fix a mistake 2022-03-15 22:47:29 -07:00
haiman
d31275c9ca
Update ColoredMaterial.java 2022-03-16 07:41:05 +08:00
haiman
51bcf3d8b9
Update ColoredMaterial.java 2022-03-15 21:50:44 +08:00
TheBusyBiscuit
114de62942 Fixed #3445 2022-03-14 18:44:48 +01:00
TheBusyBiscuit
495208a089 [CI skip] Updated changelog 2022-03-14 18:19:48 +01:00
Jeffrey Kosse
615e15b06c added tinted glass 2022-03-14 09:24:39 +01:00
ybw0014
e818597b0b
Add shulker box to ColoredMaterial 2022-03-12 16:36:22 -05:00
TheBusyBiscuit
357fee7fff
Merge pull request #3453 from FN-FAL113/fix/industrialminer-bug 
Fixes #3336
 2022-03-11 12:14:58 +01:00
TheBusyBiscuit
cea7204994 Fixed #3487 2022-03-10 21:00:28 +01:00
TheBusyBiscuit
c88b43717c
[CI skip] Merge pull request #3479 from FN-FAL113/fix/pedestal-bug 
Fix pedestal item disappearing (fixes #3476)
 2022-03-10 20:51:57 +01:00
TheBusyBiscuit
3432941ba4
[CI skip] Merge pull request #3470 from J3fftw1/master 
added rooted dirt to dirt variants (fixes #3469)
 2022-03-10 20:48:47 +01:00
Jeffrey Kosse
280440857b fixes #3483 2022-03-09 21:22:08 +01:00
TheBusyBiscuit
dc35bda574
Merge pull request #3451 from FN-FAL113/master 
Allow Fluid Pump to fill water bottles
 2022-03-09 15:57:46 +01:00
TheBusyBiscuit
e9ab775630
Merge pull request #3448 from StarWishsama/chore/guide-search-improve 
Improve guide search result
 2022-03-09 15:55:18 +01:00
TheBusyBiscuit
7668a786ca
Merge pull request #3309 from svr333/AddMiddleClickSupport 
Implement Middle Click support for Slimefun Items
 2022-03-09 14:29:05 +01:00
TheBusyBiscuit
fe2990991c
[CI skip] Merge pull request #3477 from TheSilentPro/additions 
unlocalized name and some docs
 2022-03-09 14:26:17 +01:00
TheBusyBiscuit
bd3640c7a8 [CI skip] Improved color codes test 2022-03-09 14:13:03 +01:00
TheBusyBiscuit
96f145385d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2022-03-09 14:12:40 +01:00
The Busy Bot
5adafcda64
[CI skip] New locale updates from Crowdin 2022-03-09 14:12:24 +01:00
TheBusyBiscuit
d78110b527 [CI skip] Added test to catch faulty color codes 2022-03-09 13:37:33 +01:00
The Busy Bot
1e40932dab
[CI skip] New locale updates from Crowdin 2022-03-09 13:12:32 +01:00
FN-FAL113
3c0dadef33
Added missing map import 2022-03-09 08:21:20 +08:00
FN-FAL113
de36da446f
assign return value to a variable and loop values 2022-03-08 21:05:52 +08:00
FN-FAL113
f657016aa8
Update fix comment 2022-03-08 10:12:05 +08:00
FN-FAL113
82941dd8e8
fix a little typo from a comment 2022-03-08 10:10:54 +08:00
FN-FAL113
a11ca349fa
Use the return value of addItem as basis for dropping left overs 2022-03-08 10:06:58 +08:00
FN-FAL113
9ea414bd04
Update AncientAltarListener.java 2022-03-07 08:39:19 +08:00
svr333
f83fedadbd
Add '.' after summary 2022-03-05 13:42:14 +01:00
FN-FAL113
de5524ad9a
Fix pedestal bug 2022-03-05 11:51:45 +08:00
Silent
b7c90fe400 unlocalized name and some docs 2022-03-02 17:02:10 +01:00
qwertyuioplkjhgfd
73c33e0100 Make round robin better 2022-02-25 20:51:16 -08:00
Jeffrey Kosse
7dd9cc9d11 added rooted dirt to dirt variants 2022-02-20 21:46:28 +01:00
The Busy Bot
1773ae0a4a
[CI skip] New locale updates from Crowdin 2022-02-06 01:58:00 +01:00
The Busy Bot
bca4d14a56
[CI skip] New locale updates from Crowdin 2022-02-05 11:52:43 +01:00
TheBusyBiscuit
78660f01f4
Update default value 2022-02-02 14:22:54 +01:00
StarWishsama
d82ae5bad6
chore(typo): fix isHiddenItemGroup typo 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-02-01 19:12:06 +08:00
StarWishsama
1af533733c
chore(typo): fix config type 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-02-01 19:11:44 +08:00
StarWishsama
c7539c5990
improve(guide): rename showHiddenItemInSearch to showHiddenItemGroupsInSearch 2022-02-01 11:39:50 +08:00
FN-FAL113
b00286e607
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-31 18:12:56 +08:00
StarWishsama
23a11b2f93
feat(guide): add config options for show hidden item 2022-01-31 12:45:45 +08:00
FN-FAL113
6cc4695e8c
Remove nested condition 2022-01-31 10:11:00 +08:00
FN-FAL113
45b4268871
Industrial miner fix 2022-01-31 09:16:17 +08:00
FN-FAL113
edeb4aa1c7
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-30 22:25:02 +08:00
FN-FAL113
44cf96b7f3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-30 22:24:47 +08:00
FN-FAL113
c3cc30e23c
local variables and formatting 2022-01-30 20:18:14 +08:00
FN-FAL113
6132683f00
camelCase non static instance variable 2022-01-30 19:32:36 +08:00
FN-FAL113
da37209bb8
Hopefully resolve request changes 2022-01-30 19:09:16 +08:00
FN-FAL113
ee34322dec
Added support for glass bottle 2022-01-30 10:49:55 +08:00
StarWishsama
ae18ec1114
chore(guide): don't display item that its itemGroup not be unlocked 2022-01-28 18:39:14 +08:00
The Busy Bot
d38dd0d992
[CI skip] New locale updates from Crowdin 2022-01-20 19:29:28 +01:00
qwertyuioplkjhgfd
8c8a0d24ed
Update HiddenItem.java 2022-01-20 04:17:34 +00:00
qwertyuioplkjhgfd
bf3da7b8d5
Update HiddenItem.java 2022-01-20 04:16:16 +00:00
qwertyuioplkjhgfd
6f5f5e585f
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/HiddenItem.java 
Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>
 2022-01-20 04:15:38 +00:00
Senne
32ded14292
Merge branch master 2022-01-19 22:42:58 +01:00
Senne
e02e089b7f
Add ParamsAreNonNullByDefault 2022-01-19 17:37:48 +01:00
Senne
0a8aff0695
Merge branch 'master' into AddMiddleClickSupport 2022-01-18 22:01:23 +01:00
TheBusyBiscuit
dd16b7c84c [CI skip] Fixed javadocs 2022-01-18 20:03:52 +01:00
TheBusyBiscuit
e02eedd940
Merge pull request #3275 from Sfiguz7/fix/itemsadder_cargo_stacking 
Fixes #3133
 2022-01-18 17:52:08 +01:00
Daniel Walsh
3ac8cadbc1
Fix multi-line comment 2022-01-18 14:02:50 +00:00
The Busy Bot
0a1724b63e
[CI skip] New locale updates from Crowdin 2022-01-18 13:31:11 +01:00
Daniel Walsh
220cfc9058
Update dough 2022-01-16 16:54:19 +00:00
TheBusyBiscuit
0a94854629
[CI skip] Merge pull request #3415 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x 
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.5
 2022-01-16 15:13:00 +01:00
TheBusyBiscuit
eff4bf133d Fixed unit tests 2022-01-16 15:05:01 +01:00
TheBusyBiscuit
014f832347 Fixed #3429 2022-01-16 15:02:05 +01:00
TheBusyBiscuit
e8f2a5fc49 [CI skip] Uninitialized ItemSettings will now cause test failures 2022-01-16 14:57:27 +01:00
TheBusyBiscuit
c1074faeb2 Added PlayerProfile#hasUnlockedEverything() 
and also updated all workflows to JDK 17
 2022-01-16 14:17:50 +01:00
TheBusyBiscuit
6ec11e17ef
Merge pull request #3428 from J3fftw1/feature/VanillaTransformationIceInFreezer 
Added vanilla ratios to the freezer
 2022-01-15 22:49:24 +01:00
J3fftw
4f2900045a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2022-01-15 22:29:22 +01:00
J3fftw
5af5fbf973
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-15 18:48:22 +01:00
Jeffrey Kosse
fb3f76e9eb did requested changes 2022-01-15 18:40:39 +01:00
Jeffrey Kosse
155feede96 you are a dog 2022-01-15 18:10:56 +01:00
Jeffrey Kosse
2e94b101ae formatting where? 2022-01-15 18:09:05 +01:00
Jeffrey Kosse
e38a6bf80b formatting where? 2022-01-15 18:08:22 +01:00
Jeffrey Kosse
0d80b295ff fixed imports 2022-01-15 17:57:26 +01:00
Jeffrey Kosse
4aaa6db05f added vanilla transformation to ice 2022-01-15 17:56:18 +01:00
poma123
2bc0313b2a Added a new fromJson method with isLenient parameter 2022-01-15 17:19:50 +01:00
TheBusyBiscuit
72bd02b833 Removed ChestTerminal support 2022-01-15 16:55:12 +01:00
poma123
ecdf4f939c Made BiomeMapParser public 2022-01-14 12:13:21 +01:00
qwertyuioplkjhgfd
c038e1ffc3
Apply suggestions from code review 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2022-01-12 23:38:15 +00:00
Senne
fc8ffabbcf
Switch to sfItem.isItem() 2022-01-12 22:23:19 +01:00
qwertyuioplkjhgfd
72d9e1edd4 Merge remote-tracking branch 'upstream/master' into register-filled-flask 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
 2022-01-03 18:27:35 -08:00
TheBusyBiscuit
5c1dda32a4 [CI skip] Some unit test changes 2022-01-04 01:30:21 +01:00
svr333
7f8ef8be84
Minor tweaks 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-02 15:17:45 +01:00
TheBusyBiscuit
eac32ac94c Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2022-01-02 12:51:38 +01:00
TheBusyBiscuit
f2f3a6c719 Fixed unit test 2022-01-02 12:51:30 +01:00
TheBusyBiscuit
730f2676b3
Merge pull request #3401 from variananora/feature/add-fuel-to-bio-reactor 
Add fuel types to BioGenerator
 2022-01-02 12:48:06 +01:00
TheBusyBiscuit
3d87cb3df1 Fixed #3400 2022-01-02 12:47:22 +01:00
Varian Anora
9703016ae2 Added 1.17 items and blocks 2022-01-02 18:31:46 +07:00
Varian Anora
311d600095 Add fuel types to BioGenerator 2022-01-02 18:02:52 +07:00
Senne
ef8e84a350
Invert if statement 2022-01-01 22:48:16 +01:00
Senne
4792124224
Refactor MiddleClickListener 2022-01-01 22:46:11 +01:00
TheBusyBiscuit
3993f48499 Some boring refactoring work 2022-01-01 14:34:36 +01:00
TheBusyBiscuit
0538e34578 Added Armored Jetpack recipe (resolves #1315) 2022-01-01 01:01:52 +01:00
TheBusyBiscuit
96aaa9de43 Fixed #3368 2022-01-01 00:57:13 +01:00
TheBusyBiscuit
8114729e16 Fixed #3390 2021-12-31 18:29:21 +01:00
qwertyuioplkjhgfd
330b5ff91d lol 2021-12-27 11:21:21 -08:00
Alessio Colombo
3c32194507 Fixed import order 2021-12-22 22:58:59 +01:00
Alessio Colombo
d96fa92957 Fixes #3385 2021-12-22 22:54:56 +01:00
Alessio Colombo
b46140202c Fixed android movement below y=0 2021-12-22 22:38:12 +01:00
TheBusyBiscuit
e755756dad
Merge pull request #3305 from Slimefun/feature/farmer_talisman 
Added Talisman of the Farmer (approved suggestion)
 2021-12-21 10:42:47 +01:00
TheBusyBiscuit
8229935b3a [CI skip] Fixed Unit Test 2021-12-21 10:32:39 +01:00
qwertyuioplkjhgfd
9723d6af80 this is probably unintended? 2021-12-20 23:30:56 -08:00
Alessio Colombo
8116820a53 Bleh 2021-12-20 14:04:16 +01:00
Alessio Colombo
2d526f30b4 Moved double drops to helper method 2021-12-20 13:37:01 +01:00
Daniel Walsh
77aa308a76
Oops 2021-12-18 18:13:40 +00:00
Daniel Walsh
6bfc2a1a40
Remove SF only method 2021-12-18 17:55:51 +00:00
Daniel Walsh
18665692b8
Improved the API for BiomeMap 2021-12-18 13:49:41 +00:00
TheBusyBiscuit
f0bf6f0d1d Encourage Java 17 (not required) 2021-12-17 17:57:21 +01:00
TheBusyBiscuit
2ab59393a6 Added 1.18 biome-maps 2021-12-10 23:03:17 +01:00
TheBusyBiscuit
93775e36b4 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
wip/1.18

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java
	src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java
 2021-12-10 22:45:00 +01:00
TheBusyBiscuit
250fe4c901
Merge pull request #3367 from Slimefun/api/biome-maps 
(API) Added Biome Maps [1.18 preparation]
 2021-12-10 22:38:36 +01:00
TheBusyBiscuit
2296ae3aff
[CI skip] Merge pull request #3297 from svr333/WikiUpdate 
Update wiki.json
 2021-12-10 19:39:11 +01:00
TheBusyBiscuit
4daa5d6475
[CI skip] Merge pull request #3315 from TerslenK/master 
Re-adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOC…
 2021-12-10 19:01:38 +01:00
TheBusyBiscuit
224049431e
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-12-10 18:57:28 +01:00
TheBusyBiscuit
50310fd2ce
Apply suggestions from code review 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-12-10 18:21:04 +01:00
TheBusyBiscuit
796193207e
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java 
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
 2021-12-09 16:25:47 +01:00
TheBusyBiscuit
b58fff602e Finished configuration 2021-12-09 15:28:10 +01:00
TheBusyBiscuit
6e60e94031 Updated Nether Ice biome map 2021-12-09 13:40:12 +01:00
TheBusyBiscuit
829a7d6bf6 Added version compat tests 2021-12-09 13:31:04 +01:00
TheBusyBiscuit
5ba049d29c Added lenient parsing and more documentation 2021-12-09 12:42:02 +01:00
TheBusyBiscuit
db5e4ffa2e Refactoring and documentation 2021-12-08 20:25:04 +01:00
TheBusyBiscuit
4136615c67 shhhh, this wasn't copy-pasted at all 👀 2021-12-08 18:44:36 +01:00
TheBusyBiscuit
9c938df2d5 Fixed unit test 2021-12-08 18:37:56 +01:00
TheBusyBiscuit
4ba36a7dab Added biome maps for existing resources 2021-12-08 18:36:53 +01:00
TheBusyBiscuit
074571ac22 Added more unit tests 2021-12-08 18:30:10 +01:00
TheBusyBiscuit
b2e391e099 First steps towards biome maps 2021-12-08 18:08:18 +01:00
Alessio Colombo
4e7ae6c5b0 Made gps complexity compatible with negative y 2021-12-08 15:10:17 +01:00
qwertyuioplkjhgfd
9d388445c1 generalize filled flask to hidden item 2021-12-02 10:10:29 -08:00
Daniel Walsh
ab477b412f
Push my WIP changes 2021-12-01 13:08:08 +00:00
qwertyuioplkjhgfd
4bb2bc8f26 documentation sure 2021-11-30 20:19:57 -08:00
qwertyuioplkjhgfd
e6d0584ced make filled flask nonconfigurable 2021-11-30 20:00:55 -08:00
TheBusyBiscuit
1f3d0f5c20 Fixed #3336 
(untested)
 2021-11-30 22:11:46 +01:00
TheBusyBiscuit
bacaceb22f Refactored Industrial Miner ore handling 2021-11-30 19:45:10 +01:00
qwertyuioplkjhgfd
330470b9cd register filled flask of knowledge and add respective RecipeType 2021-11-30 09:55:34 -08:00
Jeffrey Kosse
1ae54130ef changed up the tag 2021-11-07 14:44:14 +01:00
Jeffrey Kosse
9d3ef19a24 updated pressure plate tag 2021-11-07 14:23:27 +01:00
terslenk
caca7fc7b9 forgot to remove second anvil tag ;-; 2021-11-01 17:51:18 +03:00
terslenk
a9c371a1d0 forgot to remove second anvil tag ;-; 2021-11-01 17:48:28 +03:00
terslenk
78aa3074ec fixed tags location 2021-11-01 17:41:29 +03:00
terslenk
fa09f17d16 fixed values 2021-11-01 17:32:45 +03:00
terslenk
bcd0094652 removed tabs 2021-11-01 17:28:13 +03:00
TerslenK
88a496a0f1
Merge branch 'Slimefun:master' into master 2021-11-01 16:36:43 +03:00
TerslenK
62f43bfca6
Update src/main/resources/tags/gravity_affected_blocks.json 
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
 2021-11-01 16:34:33 +03:00
svr333
29585eb1a1
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-10-28 13:07:43 +02:00
svr333
0f176694a6
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-28 12:24:59 +02:00
Daniel Walsh
82978f7d5b
Merge pull request #3326 from guizhanss/fix/smithing-table-listener 2021-10-28 02:31:17 +01:00
Senne
4e92102a38
Fix typo 2021-10-23 15:18:46 +02:00
Senne
fc6805d943
Move to separate class 2021-10-23 15:17:12 +02:00
Senne
cd76f924d0
Make field static 2021-10-23 14:05:40 +02:00
ybw0014
4ea652960b
Fix smithing table listener on 1.15 and below 2021-10-22 07:22:57 +08:00
TheBusyBiscuit
a9c330d6a3 [CI skip] Fixed javadocs 2021-10-21 11:59:22 +02:00
Sfiguz7
b23a907053
Revert requested change as it breaks it :NotLikeThis: 2021-10-15 15:33:45 +02:00
Sfiguz7
0f7f48647b
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-15 15:30:46 +02:00
Alessio Colombo
f63502bf42 Updated changelog 2021-10-15 15:03:51 +02:00
Alessio Colombo
258f375357 Added toggle to data zip backup 2021-10-15 15:02:12 +02:00
Alessio Colombo
5f27e968b3 Removed unused recipe from GrindStone 2021-10-12 16:26:19 +02:00
Alessio Colombo
5817494b2a Recipe fix 2021-10-12 16:19:29 +02:00
TheBusyBiscuit
008090cc6f [CI skip] Added unit test for new debugging tool 2021-10-11 01:37:54 +02:00
TerslenK
8ba3e35f0e
Merge branch 'Slimefun:master' into master 2021-10-10 23:32:46 +03:00
TheBusyBiscuit
5883a84158
Merge branch 'master' into feature/debug-command 2021-10-10 19:45:40 +02:00
Daniel Walsh
9d222ec49c
peepoPog wow 2021-10-10 18:42:08 +01:00
TerslenK
2c2042de82
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-10 20:38:43 +03:00
Daniel Walsh
3f00777db3
Fix import 2021-10-10 18:29:01 +01:00
Daniel Walsh
cdf5142f8b
Improved message and removed tab completion 2021-10-10 17:58:09 +01:00
terslenk
7e3774ecd1 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:32:54 +03:00
terslenk
75b298ed18 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:20:35 +03:00
terslenk
af9c61904d adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:06:49 +03:00
Daniel Walsh
c18ce123c0
Add "disable" to tab complete 2021-10-09 18:02:22 +01:00
Daniel Walsh
4444fc6ec2
Changes 2021-10-09 17:57:38 +01:00
TheBusyBiscuit
e42700dc98
Merge pull request #3307 from svr333/AdjustSolarGenerator 
Solar Generators - Return night energy in non overworld dimensions
 2021-10-09 18:08:11 +02:00
Daniel Walsh
cea2ec194f
Merge branch 'feature/debug-command' of github.com:Slimefun/Slimefun4 into feature/debug-command 2021-10-09 16:35:39 +01:00
Daniel Walsh
b3ee9628b5
Add perm to plugin.yml 2021-10-09 16:35:30 +01:00
Daniel Walsh
ccd4d5bf65
Apply suggestions from code review 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-10-09 16:19:30 +01:00
Senne
b0544ee79b
Add as setting 2021-10-09 16:09:25 +02:00
Senne
42e647020f
Remove redundant line 2021-10-09 12:42:56 +02:00
Daniel Walsh
ecc0d6bb69
Added some comments 2021-10-09 10:13:27 +01:00
Daniel Walsh
1d27adabd4
Missing author tags 2021-10-09 10:06:05 +01:00
Daniel Walsh
b2590ddd42
Lots of docs and stuff 2021-10-09 10:05:09 +01:00
TheBusyBiscuit
9c3465e80f
Merge pull request #3298 from qwertyuioplkjhgfd/shift-lumber-axe 
Check for sneaking when breaking logs on lumber axe
 2021-10-08 19:32:40 +02:00
Daniel Walsh
421545111e
da hecl 2021-10-07 19:20:01 +01:00
Daniel Walsh
fd148f9d8e
Another log 2021-10-07 19:14:08 +01:00
Daniel Walsh
f0d4b57a47
Fix bug 2021-10-07 19:12:16 +01:00
Senne
4cff65ed16
Resolve conflicts 2021-10-07 17:26:05 +02:00
Senne
bdf2a1b8a1
Clean up if 2021-10-07 17:25:20 +02:00
svr333
eb790b232b
rename blockData to blockId 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-07 17:19:24 +02:00
Senne
c882154860
Typos 2021-10-07 15:22:14 +02:00
Senne
02b0411d57
Clone item 2021-10-07 15:21:33 +02:00
Senne
6978bdfe0d
Implement feature 2021-10-07 15:11:42 +02:00
Daniel Walsh
3284604160
Implement the ability for debug logging 2021-10-07 13:51:31 +01:00
Senne
0937391220
Initial tryout 2021-10-06 23:24:33 +02:00
Sfiguz7
73a59014cc Restored and removed the correct comments 2021-10-06 22:57:23 +02:00
Sfiguz7
a3b65280fe Merge branch 'feature/farmer_talisman' of github.com:Slimefun/Slimefun4 into feature/farmer_talisman 2021-10-06 21:44:48 +02:00
Sfiguz7
faa57514c2 Removed comments related directly to miner talisman 2021-10-06 21:44:13 +02:00
Sfiguz7
0eeaa777c3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-10-06 21:40:11 +02:00
TweepCoding
48d01f9aae Removed unnecesary runSync() calls 2021-10-06 10:57:34 -05:00
Sfiguz7
6e24269c59 Added research message 2021-10-06 16:35:45 +02:00
Senne
ef3db81157
Return night energy in other dimensions 2021-10-06 16:03:41 +02:00
Senne
8b037f9310
Fix logic 2021-10-06 14:38:21 +02:00
svr333
cacb0a82e3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-06 14:37:31 +02:00
Senne
da988c981f
Use correct if 2021-10-06 14:30:40 +02:00
Senne
d3c9bbdcac
Improve Right Click in Cheat Menu 
On right click it will check if the user is holding shift, if so it will give a full stack.
 2021-10-06 11:14:08 +02:00
Sfiguz7
e6ed69c26e Removed warts, not exactly a crop so feels weird 2021-10-06 01:08:00 +02:00
Sfiguz7
d3007c21fb Added author 2021-10-06 01:03:29 +02:00
Sfiguz7
273cf78082 Added talisman message 2021-10-06 00:30:31 +02:00
Sfiguz7
9cfcc5c402 Added farmer talisman 2021-10-06 00:18:44 +02:00
qwertyuioplkjhgfd
36912f517f check for sneaking on lumber axe 2021-10-02 20:03:03 -07:00
Sfiguz7
fe9d11d879
Fix explosive bow knockback being way too high if close to the entity (#3295) 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-02 23:38:50 +01:00
Senne
e1a0ade124
Finish wiki.json 2021-10-02 17:13:59 +02:00
Senne
1aa2260cf0
wiki.json until Talisman category 2021-10-02 15:32:46 +02:00
Senne
96382a1a4b
Add wiki.json pages 2021-10-02 00:05:08 +02:00
Sfiguz7
dc45346c7a Renamed meta to snapshot since it is one 2021-10-01 17:18:48 +02:00
Daniel Walsh
3b31431ab1
[CI Skip] Merge pull request #3292 from Sfiguz7/fix/solargen-ischargeable 2021-09-30 16:15:01 +01:00
Sfiguz7
e5c58b2493 Removed useless overriding 2021-09-30 16:30:20 +02:00
KyleEstein
84dc096393
Merge branch 'master' into legacy-gold-pan 2021-09-30 08:46:22 -04:00
Daniel Walsh
e2d2ec60de
Merge pull request #3279 from variananora/fix/3265 2021-09-28 15:13:58 +01:00
Sfiguz7
215ac668e0 Added capaciy to solargens 2021-09-26 14:45:30 +02:00
Sfiguz7
a1cd40998b Removed unneeded final: added in a fix, limits extensibility 2021-09-26 14:32:08 +02:00
TheBusyBiscuit
36c6d15421
Merge pull request #3252 from Sefiraat/smithing-table-listener 
Smithing table listener
 2021-09-25 21:15:26 +02:00
TheBusyBiscuit
2d34d61d9a
Merge pull request #3274 from variananora/fix/3273 
Fixes #3273
 2021-09-25 20:59:29 +02:00
Kyle Einstein
26442b3198 Add override-output-limit setting for Electric Gold Pans to allow EGP to still be useful when cargo networks are disabled. 2021-09-23 11:16:06 -04:00
ybw0014
703196bb7b add break to switch default 2021-09-23 11:16:06 -04:00
ybw0014
e58b52ca7e add default to switch 2021-09-23 11:16:06 -04:00
ybw0014
8d89739d9b move imports 2021-09-23 11:16:06 -04:00
ybw0014
ae6cfdcf0f Hercules' Pickaxe now supports 1.17 deepslate ores and copper 2021-09-23 11:16:06 -04:00
Varian Anora
1da20d0846 Better formatting 2021-09-23 18:37:06 +07:00
Varian Anora
eec5d2d66b Merge remote-tracking branch 'upstream/master' into fix/3265 2021-09-23 18:05:49 +07:00
Varian Anora
cc018582a6 Fixed #3265 
Add checks for off hand items.
 2021-09-23 18:05:42 +07:00
Daniel Walsh
7e04117357
Merge pull request #3253 from guizhanss/feature/hercules-pickaxe-update 2021-09-23 11:52:26 +01:00
Sfiguz7
e64cb10447 Merge branch 'fix/itemsadder_cargo_stacking' of https://github.com/Sfiguz7/Slimefun4 into fix/itemsadder_cargo_stacking 2021-09-23 12:42:44 +02:00
Sfiguz7
47f5278e48 Reverted to equalsLore 2021-09-23 12:41:10 +02:00
Kyle Einstein
ba8cc49b6e Allow admins to control the behavior of the Electric Gold Pan via the legacy-gold-pan configuration option. 2021-09-22 20:43:15 -04:00
Sfiguz7
e880a9bb07
Merge branch 'master' into fix/itemsadder_cargo_stacking 2021-09-22 21:57:46 +02:00
Sfiguz7
3ff5a49c5a And more... 2021-09-22 21:47:37 +02:00
Sfiguz7
d6ad57b60f More formatting 2021-09-22 21:45:09 +02:00
Sfiguz7
e32b6ff064 Undid formatting 2021-09-22 21:38:35 +02:00
Sfiguz7
aa456901e4 Fixes #3133 2021-09-22 21:19:44 +02:00
Varian Anora
fc8c02c777 Add missing recipes to Electrified Crucible 
This will make normal crucible and electrified crucible have the same recipe.
Fixes #3273
 2021-09-21 21:52:01 +07:00
TheBusyBiscuit
19c7e235ed Small improvements 2021-09-19 19:39:06 +02:00
TheBusyBiscuit
4727b2a5dd
Merge pull request #3258 from Slimefun/performance/improve-item-comparison-performance 
Improves item comparison performance
 2021-09-19 18:58:26 +02:00
TheBusyBiscuit
6a712696fc
Merge pull request #3259 from Sfiguz7/feature/auto-ench-lvl-override-config 
Fixes #3248
 2021-09-19 15:34:46 +02:00
TheBusyBiscuit
c83c84e61e [CI skip] Updated changelog 2021-09-19 15:34:30 +02:00
Sfiguz7
1a3a50120f Defaulted to fixed. Requested changes 2021-09-16 20:31:25 +02:00
Sfiguz7
7e98984547 Formatting... 2021-09-15 18:11:03 +02:00