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
|
6175540a4e
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into breaking-changes/class-relocation
|
2021-07-15 17:29:43 +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 |
|
TheBusyBiscuit
|
09ff10da94
|
[CI skip] Merge pull request #3173 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.12
|
2021-07-15 11:55:30 +02:00 |
|
StarWishsama
|
03ab985033
|
refactor: optimize slot check
|
2021-07-15 16:43:13 +08:00 |
|
Renovate Bot
|
5c0775e4c6
|
Update dependency com.konghq:unirest-java to v3.11.12
|
2021-07-14 20:43:07 +00:00 |
|
TheBusyBiscuit
|
91c6e869a5
|
Updated group id of baked-libs
|
2021-07-14 17:41:26 +02: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 |
|
TheBusyBiscuit
|
89ac634113
|
[CI skip] Updated readme
|
2021-07-12 17:32:50 +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 |
|
Daniel Walsh
|
7c8d168694
|
Merge pull request #3169 from guizhanss/feature/miner-outcome
Allow the Industrial Miner to produce raw ores rather than ore blocks
|
2021-07-12 11:42:40 +01:00 |
|
TheBusyBiscuit
|
b5c2732c2c
|
[CI skip] Updated changelog
|
2021-07-12 12:26:08 +02: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 |
|
TheBusyBiscuit
|
a94d26edfc
|
Merge pull request #3163 from martinbrom/feature/miner-deepslate-option
Add the option to prevent IndustrialMiner from mining deepslate ores
|
2021-07-10 12:33:18 +02:00 |
|
TheBusyBiscuit
|
ad2e0f3dbc
|
[CI skip] Updated changelog
|
2021-07-10 12:33:11 +02:00 |
|
TheBusyBiscuit
|
0fdca470e4
|
[CI skip] Merge pull request #3165 from Slimefun/renovate/me.clip-placeholderapi-2.x
Update dependency me.clip:placeholderapi to v2.10.10
|
2021-07-10 12:32:13 +02:00 |
|
EpicPlayerA10
|
962833b50f
|
Typo
|
2021-07-10 11:22:37 +02:00 |
|
Martin Brom
|
138394e5a0
|
Resolves #3164
|
2021-07-10 10:40:36 +02:00 |
|
Martin Brom
|
11ba156bb3
|
Change the default value for canMineDeepslateOres to true
|
2021-07-10 09:07:53 +02:00 |
|
Renovate Bot
|
795a4c02db
|
Update dependency me.clip:placeholderapi to v2.10.10
|
2021-07-10 05:05:25 +00: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 |
|
TheBusyBiscuit
|
5279ddc67b
|
[CI skip] Updated changelog
|
2021-07-09 12:13:25 +02:00 |
|
TheBusyBiscuit
|
04e2fab457
|
[CI skip] Merge pull request #3159 from LilBC/patch-2
Added My Minecraft Name to The Contributor List
|
2021-07-09 12:12:32 +02:00 |
|
TheBusyBiscuit
|
e1e75ab2d7
|
[CI skip] Merge pull request #3160 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.0
|
2021-07-09 12:12:06 +02:00 |
|
Renovate Bot
|
03e10830d1
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.0
|
2021-07-08 18:59:52 +00: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 |
|