mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
7,815 Commits 1 Branch 0 Tags 64 MiB
281d1e7632
Commit Graph

5603 Commits

Author SHA1 Message Date
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
Sfiguz7
d83d18819f Removed unused imports 2021-09-15 18:09:44 +02:00
Sfiguz7
ff58385063 Fixes 2021-09-15 18:07:24 +02:00
Daniel Walsh
fbc3f9ee92
Improves item comparison performance 
There are a lot of situations where SF items are CraftItemStacks not SlimefunItemStacks

This is most obvious with cargo and has been a big bottleneck there (~60%).

This PR addresses the cargo specific point but will probably carry over to other parts of the code here and in addons.

In Cargo we wrap the items being used for comparison, these items can still be SF items just, they look like regular Bukkit items. So, the is item similar check should account for this.

With this change it will check if it's wrapped and if it has item meta, if it does then it will try and get IDs to compare. Otherwise, fall back to usual item meta comparison. This improves cargo performance by about 60% when filtering SF items.
 2021-09-15 11:22:19 +01:00
ybw0014
e9b5ea5e81
add break to switch default 2021-09-14 18:11:18 +08:00
ybw0014
2c8a40cb26
add default to switch 2021-09-14 18:10:08 +08:00
Sefiraat
5d6b7e6ace
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-09-14 10:05:55 +01:00
Sefiraat
002a0e3e46
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-09-14 07:07:58 +01:00
ybw0014
fbc6253175
move imports 2021-09-14 02:20:31 +08:00
ybw0014
cc0add1137
Hercules' Pickaxe now supports 1.17 deepslate ores and copper 2021-09-14 02:16:55 +08:00
Sefiraat
83a4d1b65d Comment to show it's the Material/Netherite slot 2021-09-13 14:42:50 +01:00
Sefiraat
153f33a72b Message indentation and remove random && 2021-09-13 14:36:17 +01:00
Sefiraat
20beabcc3b
Apply suggestions from code review 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-09-13 14:13:27 +01:00
Sefiraat
13db44011b Slight wording change 2021-09-13 14:02:09 +01:00
Sefiraat
206e205d1b Deny using Slimefun Netherite in the SmithingTable + Tests 2021-09-13 13:26:35 +01:00
TheBusyBiscuit
79c6c139c6 Fixed #3241 2021-09-09 13:54:48 +02:00
TheBusyBiscuit
68e32cb358 Fixed #3218 2021-09-09 12:58:57 +02:00
TheBusyBiscuit
fc207b6a83
Merge pull request #3232 from svr333/FixCategoryNaming 
Rename category -> itemGroup
 2021-09-06 14:40:19 +02:00
Daniel Walsh
4d94c043d5
Fix metrics not being able to download 
We used REPO_NAME in quite a few places which I didn't expect but here we are. Anyway, this fixes that.
 2021-09-06 13:25:38 +01:00
Senne
ed89b2346c
Update naming in tests 2021-09-06 13:18:29 +02:00
Senne
fd2b8d0578
Rename category to itemgroup in messages.yml 2021-09-06 13:17:11 +02:00
Daniel Walsh
bafcd536f7
Update repo 2021-09-06 11:04:24 +01:00
Senne
f7f2c62ef7
Un-rename android category 2021-09-05 13:24:14 +02:00
Senne
8995005915
Replace category -> itemGroup 2021-09-04 12:52:29 +02:00
TheBusyBiscuit
6951251394 Some additional cleanup 2021-09-03 14:01:55 +02:00
TheBusyBiscuit
9451e256e5
Merge pull request #3229 from Bencey/patch-1 
Fixed ender lump guide entry
 2021-09-03 13:43:01 +02:00
Benjamin Durham
50b6377d5d
Fixed broken import 2021-09-03 11:16:45 +12:00
Daniel Walsh
02cc920109
Fix the other instances of Inventory#isEmpty 2021-09-02 16:14:12 +01:00
Daniel Walsh
ffdf9c8ea6
Forgot the util class reee 2021-09-02 16:08:55 +01:00
Daniel Walsh
42d6d259a8
Merge master 2021-09-02 16:07:35 +01:00
Daniel Walsh
8a0587a111
Merge pull request #3228 from Slimefun/fix/issue-3206 
Fixes #3206
 2021-09-02 16:06:38 +01:00
Daniel Walsh
535c7f47f9
Fixes #3206 2021-09-02 14:07:38 +01:00
Daniel Walsh
39d0080fe7
Fix compilation 2021-09-02 13:41:33 +01:00
Daniel Walsh
2519e884fa
Merge branch 'master' of github.com:Slimefun/Slimefun4 into breaking-changes/class-relocation 2021-09-02 13:39:54 +01:00
Daniel Walsh
f95dd9a6e3
Merge pull request #3227 from variananora/add-1.17-blocks-to-electric-press 
Add some new 1.17 blocks to electric press
 2021-09-02 13:39:26 +01:00
Varian Anora
7b37663f47 Add new 1.17 blocks to electric press 
Added 4 Amethyst Shard -> Amethyst Block
Added 9 Copper Ingot -> Copper Block
Added 9 Raw Iron -> Raw Iron Block
Added 9 Raw Gold -> Raw Gold Block
Added 9 Raw Copper -> Raw Copper Block
 2021-09-02 12:40:25 +07:00
Daniel Walsh
1513b01f85
Fix tests 2021-09-01 21:15:42 +01:00
Daniel Walsh
0841e1ef14
Fix naming of setCategory -> setItemGroup 2021-09-01 21:14:25 +01:00
Daniel Walsh
aa9e7a49d9
Fix compilation 2021-09-01 21:13:58 +01:00
Daniel Walsh
d64f2bba3f
Merge branch 'master' into breaking-changes/class-relocation 2021-09-01 21:03:22 +01:00
Daniel Walsh
72573eebcd
Remove unused var 2021-09-01 19:05:50 +01:00
Daniel Walsh
1ba0062ab2
Fixes #3225 and chunk data not being saved on shutdown 
We had a `chunksLoaded` boolean, not sure why this was here but removing it did not cause any unexpected changes.

We have a world name check so this in theory should not be required. If there was a reason which is still valid, we will find out soon and should do a proper fix rather than this.

I also fixed the chunk data not saving on normal shutdown
 2021-09-01 19:03:19 +01:00
Benjamin Durham
832da8f146
Guide shows wrong machine 
Enderlump 1 is made with grindstone not the enhanced crafting table
 2021-09-01 17:16:01 +12:00
Daniel Walsh
d6be483a32
Merge pull request #3196 from ItchyDitchy/master 2021-08-30 12:43:15 +01:00
Daniel Walsh
3b1a5d02e2
Merge pull request #3200 from svr333/ChangeSfGuideMsg 
Update message to show category
 2021-08-24 08:45:36 +01:00
The Busy Bot
35895f4e26
[CI skip] New locale updates from Crowdin 2021-08-20 23:49:33 +02:00
Daniel Walsh
e187d87828
Merge pull request #3204 from Slimefun/fix/pickup-delay 2021-08-17 13:52:04 +01:00
Daniel Walsh
54efbe9625
Update comment 2021-08-17 12:19:50 +01:00
The Busy Bot
a8081c3eee
[CI skip] New locale updates from Crowdin 2021-08-17 11:16:06 +02:00
WalshyDev
afda035689
remove log 2021-08-17 06:56:25 +01:00
WalshyDev
4a65941e00
Fixes #3203 2021-08-17 06:52:25 +01:00
svr333
5daa0fa5fe
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java 2021-08-13 11:16:54 +02:00
svr333
a6474b92f5
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:50 +02:00
svr333
2fce1e527e
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:45 +02:00
svr333
9da4e5d43a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:40 +02:00
ItchyDitchy
e56fa84754
Code Format 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-08-13 09:45:31 +08:00
svr333
fef3b745ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java 2021-08-12 23:35:05 +02:00
Senne
7b29813385
Update message to show category 2021-08-12 16:28:24 +02:00
ItchyDitchy
c0a4ef4946
Shorter Code 
Title says it all
 2021-08-08 19:09:08 +08:00
ItchyDitchy
1a08f1a36d
Move Support 
Just noticed that an android may move in a border, so this is a fix for it.
 2021-08-08 19:02:58 +08:00
ItchyDitchy
60df36975c
Code Format Fix 2021-08-06 21:40:41 +08:00
ItchyDitchy
dee4bc97e8
Code format 2021-08-06 21:39:22 +08:00
ItchyDitchy
6d632d1ad6
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java 
Code Style Fix

Co-authored-by: Martin Brom <16322387+martinbrom@users.noreply.github.com>
 2021-08-06 21:34:40 +08:00
ItchyDitchy
8da16ce0a7
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java 
Code Style Fix

Co-authored-by: Martin Brom <16322387+martinbrom@users.noreply.github.com>
 2021-08-06 21:34:13 +08:00
ItchyDitchy
6ca3360db9 WorldBorder Support 
Androids can go past and do stuff outside the world border.

This is a fix.
 2021-08-06 14:26:04 +08: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
TheBusyBiscuit
0df4694a63
Merge pull request #3192 from guizhanss/feature/raw-metals-luck-multiplier 
Add Enhanced furnaces' luck multiplier for raw ores in 1.17, resolves #3190
 2021-08-05 10:05:13 +02:00
ybw0014
bb147e26ab rename the new tag 2021-08-04 20:46:30 +08:00
ybw0014
bced5ba4b1 add a new tag for luck multiplier 2021-08-03 18:26:34 +08:00
ybw0014
7021df8a54 remove unnecessary codes 2021-08-03 17:58:59 +08:00
ybw0014
dfd6d372cd use slimefun tag 2021-08-02 12:20:13 +08:00
ybw0014
33ce8ecff6 enhanced furnaces' luck multiplier for raw ores in 1.17 2021-08-02 03:13:32 +08:00
ybw0014
30cfcfa292 missed one 2021-08-02 02:44:26 +08:00
ybw0014
9574227783 use ChestMenuUtils to support CustomModelData and update docs in Reactor 2021-08-02 02:22:02 +08:00
TheBusyBiscuit
707b219e18 [CI skip] Reduced technical debt 2021-08-01 14:24:52 +02:00
TheBusyBiscuit
157890aebe
Merge pull request #3186 from Apeiros-46B/master 
Added sneaking check to ExplosiveTool
 2021-08-01 10:24:59 +02:00
TheBusyBiscuit
5a0414aca9
[CI skip] Merge pull request #3179 from hwang-pku/fix-bug 
Fix a flaky test
 2021-08-01 10:23:58 +02:00
TheBusyBiscuit
4b43cd6eaa Fixed Auto-Disenchanter exploit using mcMMO's "super ability" tools 2021-07-31 12:27:42 +02:00
Apeiros-46B
fcee14cb0c Added sneaking check to ExplosiveTool 2021-07-30 21:54:41 -07: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
0262830ef5
Merge pull request #3107 from martinbrom/fix/flex-category-visibility 
FlexCategories can now be made visible in CheatSheet and Survival SlimefunGuide
 2021-07-26 20:57:59 +02:00
TheBusyBiscuit
65e50ea81c
Merge pull request #3109 from Slimefun/Thehrz/master 
Fixes #2677
 2021-07-26 17:33:39 +02:00
TheBusyBiscuit
1f4a97aa5c
Merge pull request #3134 from NgLoader/master 
Intregation: Orebfuscator
 2021-07-26 12:51:31 +02:00
hwang-pku
c390803d27
clean formatting issues 2021-07-25 21:17:55 -07:00
hwang-pku
ac539063e6
clean formatting issues 2021-07-25 21:17:27 -07:00
Hao Wang
3c20a9fae6 Merge branch 'fix-bug' of https://github.com/hwang-pku/Slimefun4 into fix-bug 
fix a flaky test
 2021-07-25 21:14:01 -07:00
Hao Wang
61b1bf4602 fix a flaky test 2021-07-25 21:13:42 -07: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
TheBusyBiscuit
55bbe05961 Fixed unbreakable Flint and Steel still being damaged in Smeltery 2021-07-25 23:41:47 +02:00
TheBusyBiscuit
c46cfa6686
Merge pull request #3181 from Phoenix-Starlight/patch-1 
Update wiki.json
 2021-07-25 23:40:34 +02:00
TheBusyBiscuit
e31ea4f404 Fixed #3177 2021-07-25 15:03:32 +02:00
Phoenix-Starlight
af765c23f0
Update wiki.json 2021-07-24 23:21:50 -07:00
Phoenix-Starlight
07e6fceb22
Update wiki.json 
Alphabetical sorting.
 2021-07-24 22:35:45 -07:00
NgLoader
74e18c98ed
Update src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-24 19:14:19 +02:00
NgLoader
c1b373fc83
Revert "feat: added MultiBlockBreakEvent" 
This reverts commit bd85eab39c.
 2021-07-24 03:21:51 +02:00
NgLoader
73e757212e
Revert "fix: fixed tab" 
This reverts commit 5aeb3e8c84.
 2021-07-24 03:21:38 +02:00
hwang-pku
788744c21e
Merge branch 'Slimefun:master' into fix-bug 2021-07-24 02:24:54 +08:00
Daniel Walsh
b0611c694a
Merge pull request #3167 from martinbrom/fix/ancient-pedestal-renamed-item 
Fix renamed items turning into valid-ish items for crafting purposes
 2021-07-23 09:22:15 +01:00
Senne
40635c7bd5
Move to var 2021-07-20 21:25:47 +02:00
Hao Wang
077cd22b99 fix a flaky test 2021-07-18 21:20:38 -07:00
TheBusyBiscuit
9c0d28e64b Updated to CommonPatterns 2021-07-17 19:24:29 +02:00
TheBusyBiscuit
a2a42a7b62 Fixed PatternUtils 2021-07-17 19:19:40 +02:00