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,226 Commits 1 Branch 0 Tags 64 MiB
9cfcc5c402
Commit Graph

5275 Commits

Author SHA1 Message Date
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
TheBusyBiscuit
c8c9a35b6a Fixed Table Saw 2021-07-17 19:18:53 +02:00
TheBusyBiscuit
5ff71c4f71 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/StormStaff.java
 2021-07-17 19:15:04 +02:00
TheBusyBiscuit
8c0ef8a97f
Merge pull request #3138 from EpicPlayerA10/master 
Fixed #3136 disappearing items with output chest by machines
 2021-07-17 19:07:55 +02:00
TheBusyBiscuit
13b7f05fd9
Merge pull request #3171 from StarWishsama/fix/talisman-anvil-offhand 
Fixes Talisman of anvil break main hand item in special case
 2021-07-17 19:06:43 +02:00
TheBusyBiscuit
53413747f2
Merge pull request #3117 from martinbrom/chore/limited-use-item 
Add LimitedUseItem - base class for items with limited uses
 2021-07-17 18:54:16 +02:00
TheBusyBiscuit
ddd2d21245 Finished first transition to dough 2021-07-15 14:24:24 +02:00
TheBusyBiscuit
cdf379ab49 Fixed UpdaterService 2021-07-15 13:03:39 +02:00
StarWishsama
03ab985033
refactor: optimize slot check 2021-07-15 16:43:13 +08:00
TheBusyBiscuit
3a302217bf Fixed locale implementation 2021-07-14 17:25:21 +02:00
TheBusyBiscuit
5abab2ef7a More dough implementations 2021-07-14 17:14:55 +02:00
TheBusyBiscuit
6de1fe821c More progress on dough implementation 2021-07-14 16:58:10 +02:00
TheBusyBiscuit
51b5d1c020 Fixed unit test imports 2021-07-14 16:51:50 +02:00
TheBusyBiscuit
0cc9bd91de Progress towards dough 2021-07-14 16:47:41 +02:00
TheBusyBiscuit
e40222f2fc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNetworkTask.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/ChristmasPresent.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/EasterEgg.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GoldPan.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfContainment.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AutoCrafterListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
 2021-07-14 14:51:18 +02:00
StarWishsama
17d7521115
chore: revert order change 2021-07-14 11:10:25 +08:00
StarWishsama
22155edd71
refactor: optimize check method 2021-07-14 11:08:59 +08:00
StarWishsama
a0e6628acc
fix(talisman): use correct slot number 2021-07-13 11:10:06 +08:00
StarWishsama
0d4502e739
fix(talisman): add validate for offhand to avoid fix wrong item 2021-07-13 10:57:39 +08:00
EpicPlayerA10
df25a9e6f6
Improve performance 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-12 17:41:24 +02:00
EpicPlayerA10
407d5de6e7 Delete unused imports 2021-07-12 16:17:59 +02:00
EpicPlayerA10
35e3b1be8c Merge remote-tracking branch 'origin/master' 2021-07-12 16:12:27 +02:00
EpicPlayerA10
5bf0b5ee74 Some fixing 2021-07-12 16:12:07 +02:00
Daniel Walsh
6392af004f
Merge pull request #3168 from guizhanss/feature/more-in-ore-crusher 
Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher
 2021-07-12 11:43:41 +01:00
EpicPlayerA10
881beebacf
Merge branch 'Slimefun:master' into master 2021-07-12 11:22:42 +02:00
EpicPlayerA10
b9420da407 Some optimizations 2021-07-12 11:05:34 +02:00
ybw0014
2085e92410 restore comment 2021-07-12 04:04:24 +08:00
ybw0014
f9e84b65ba remove duplicated codes 2021-07-12 00:26:46 +08:00
ybw0014
ba80281210 Change format 2021-07-11 23:01:10 +08:00