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
|
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
|
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 |
|