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
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
EpicPlayerA10
|
f56ef90dbf
|
More cleanup
|
2021-07-03 22:02:00 +02:00 |
|
EpicPlayerA10
|
a2d38c3a05
|
Code Cleanup
|
2021-07-03 21:56:47 +02:00 |
|
EpicPlayerA10
|
26b897391a
|
Change from Dispenser to Container
|
2021-07-03 21:54:16 +02:00 |
|
EpicPlayerA10
|
0128d57af0
|
Move code to superclass and call method in other machines
|
2021-07-03 21:36:15 +02:00 |
|
Martin Brom
|
c93dea06ed
|
Allow IndustrialMiner to mine when minWorldHeight is lower than 0
|
2021-07-03 12:06:59 +02:00 |
|
LilBC
|
ebfb7904b7
|
Reordered Codes
|
2021-07-02 09:24:10 -04:00 |
|
LilBC
|
7a40027937
|
Made Error Message More Informative
|
2021-07-02 09:14:59 -04:00 |
|
LilBC
|
36894894be
|
Changed Naming
Changed recipe-unavailable to recipe-unavailable.
|
2021-07-02 09:02:19 -04:00 |
|
LilBC
|
680511ee11
|
Fix hasUnlockedRecipe and Bad Imports
|
2021-07-02 08:58:53 -04:00 |
|
The Busy Bot
|
101139bb2f
|
[CI skip] New locale updates from Crowdin
|
2021-07-02 14:09:11 +02:00 |
|
LilBC
|
0b2c3dba83
|
Add files via upload
|
2021-07-01 18:46:59 -04:00 |
|
LilBC
|
a922e2e8cc
|
Add files via upload
|
2021-07-01 18:16:13 -04:00 |
|