mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
7,000 Commits 1 Branch 0 Tags 64 MiB
a2a42a7b62
Commit Graph

3877 Commits

Author SHA1 Message Date
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
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
ybw0014
ab6da98697 Changes outcomes for industrial miner 2021-07-11 22:25:07 +08:00
ybw0014
6be06f07f6 Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher 2021-07-11 22:22:56 +08:00
EpicPlayerA10
962833b50f Typo 2021-07-10 11:22:37 +02:00
Martin Brom
11ba156bb3 Change the default value for canMineDeepslateOres to true 2021-07-10 09:07:53 +02:00
Martin Brom
8e13b41a34 Reorder conditions to prevent a possible version error 2021-07-10 00:18:03 +02:00
Martin Brom
7285277707 Add the option to prevent IndustrialMiner from mining deepslate ores 2021-07-09 23:59:27 +02:00
TheBusyBiscuit
e58a6219ff
Merge pull request #3151 from Apeiros-46B/master 
Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone
 2021-07-09 12:13:38 +02:00
Lil_BC
5fe8dff05e
Added My Minecraft Name 2021-07-08 11:54:04 -04:00
EpicPlayerA10
3e48012d8f Sort imports correctly 2021-07-08 12:36:34 +02:00
EpicPlayerA10
c148c8b4da Added SlimefunUtils.spawnItem instead of dropItemNaturally 2021-07-08 12:33:53 +02:00
EpicPlayerA10
dd343e8e73
Merge branch 'Slimefun:master' into master 2021-07-08 12:20:19 +02:00
TheBusyBiscuit
5a1442f13a Added SlimefunItemSpawnEvent and ItemSpawnReason 
This allows other plugins to provide compatibility in some places
 2021-07-08 11:17:56 +02:00
TheBusyBiscuit
e19f291904
Merge pull request #3145 from martinbrom/fix/mining-task-world-height 
Allow IndustrialMiner to mine when minWorldHeight is lower than 0
 2021-07-08 10:42:28 +02:00
EpicPlayerA10
e8c99044c5
Merge branch 'Slimefun:master' into master 2021-07-07 10:15:31 +02:00
The Busy Bot
2c55eacbe3
[CI skip] New locale updates from Crowdin 2021-07-07 09:58:43 +02:00
Apeiros-46B
214dc533a5 Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone 2021-07-06 02:49:22 -07:00
The Busy Bot
0fdd6edb00
[CI skip] New locale updates from Crowdin 2021-07-06 10:42:21 +02:00
LilBC
5ca97bcd09
Update src/main/resources/languages/en/messages.yml 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-05 08:52:24 -04:00
LilBC
55f777eb17
Merge branch 'Slimefun:master' into master 2021-07-04 21:40:23 -04:00
EpicPlayerA10
b6b83ca974 Changed doc 2021-07-04 12:30:17 +02:00
LilBC
564a1a0905
Update src/main/resources/languages/en/messages.yml 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-07-04 01:27:35 -04:00
LilBC
74fba2e1f5
Corrected Inverted Unlocked Recipe Check 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-04 00:35:19 -04:00