Daniel Walsh
|
b1b87580ec
|
[CI Skip] Merge pull request #3219 from Slimefun/renovate/devmasx-merge-branch-1.x
Update devmasx/merge-branch action to v1.4.0
|
2021-08-30 12:02:00 +01:00 |
|
Daniel Walsh
|
0c134ee778
|
[CI Skip] Merge pull request #3216 from Slimefun/renovate/thollander-actions-comment-pull-request-1.x
Update thollander/actions-comment-pull-request action to v1.0.2
|
2021-08-30 12:01:23 +01:00 |
|
Renovate Bot
|
eebe7a3ee2
|
Update devmasx/merge-branch action to v1.4.0
|
2021-08-30 10:59:31 +00:00 |
|
Renovate Bot
|
8b004058af
|
Update thollander/actions-comment-pull-request action to v1.0.2
|
2021-08-30 10:59:28 +00:00 |
|
Daniel Walsh
|
7272154e20
|
[CI Skip] Merge pull request #3217 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.13
|
2021-08-30 11:58:42 +01:00 |
|
Daniel Walsh
|
0c18841ac6
|
[CI Skip] Merge pull request #3222 from Slimefun/Sfiguz7-patch-1
|
2021-08-30 11:57:59 +01:00 |
|
Sfiguz7
|
0a49e5fd0b
|
Update maven-compiler.yml
|
2021-08-30 12:15:17 +02:00 |
|
Renovate Bot
|
85f62a6688
|
Update dependency com.konghq:unirest-java to v3.11.13
|
2021-08-27 16:53:12 +00:00 |
|
TheBusyBiscuit
|
2f24df1a04
|
[CI skip] Merge pull request #3212 from Slimefun/renovate/actions-setup-java-2.x
Update actions/setup-java action to v2.3.0
|
2021-08-26 20:41:55 +02:00 |
|
Daniel Walsh
|
f1180d6419
|
[CI Skip] Merge pull request #3213 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.12.4
|
2021-08-26 10:10:18 +01:00 |
|
Renovate Bot
|
9178fa7505
|
Update dependency org.mockito:mockito-core to v3.12.4
|
2021-08-25 21:28:35 +00:00 |
|
Daniel Walsh
|
3b1a5d02e2
|
Merge pull request #3200 from svr333/ChangeSfGuideMsg
Update message to show category
|
2021-08-24 08:45:36 +01:00 |
|
Renovate Bot
|
269350cfb2
|
Update actions/setup-java action to v2.3.0
|
2021-08-23 12:51:29 +00:00 |
|
Daniel Walsh
|
d3bde94a7d
|
[CI Skip] Merge pull request #3210 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6
|
2021-08-22 11:13:15 +01:00 |
|
Daniel Walsh
|
f7dbb9dffc
|
[CI Skip] Merge pull request #3211 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.6
|
2021-08-22 11:12:47 +01:00 |
|
Renovate Bot
|
51681529ab
|
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.6
|
2021-08-22 05:08:57 +00:00 |
|
Renovate Bot
|
62e6b517a6
|
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6
|
2021-08-22 05:08:54 +00:00 |
|
The Busy Bot
|
35895f4e26
|
[CI skip] New locale updates from Crowdin
|
2021-08-20 23:49:33 +02:00 |
|
TheBusyBiscuit
|
c3eed1ed40
|
[CI skip] Merge pull request #3207 from Slimefun/renovate/ibiqlik-action-yamllint-3.x
Update ibiqlik/action-yamllint action to v3.0.4
|
2021-08-20 23:49:06 +02:00 |
|
TheBusyBiscuit
|
312f308143
|
[CI skip] Merge pull request #3208 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.12.1
|
2021-08-20 23:48:57 +02:00 |
|
Renovate Bot
|
7ba7f9342a
|
Update dependency org.mockito:mockito-core to v3.12.1
|
2021-08-20 15:56:59 +00:00 |
|
Renovate Bot
|
b565c9d777
|
Update ibiqlik/action-yamllint action to v3.0.4
|
2021-08-19 17:05:14 +00:00 |
|
TheBusyBiscuit
|
c5f365f9ad
|
[CI skip] Updated changelog
|
2021-08-17 23:23: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 |
|
TheBusyBiscuit
|
86c1bbb10c
|
[CI skip] Merge pull request #3199 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.201
|
2021-08-11 12:55:22 +02:00 |
|
Renovate Bot
|
be69814f75
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.201
|
2021-08-10 22:16:12 +00:00 |
|
TheBusyBiscuit
|
d841f3ac22
|
[CI skip] Merge pull request #3198 from Slimefun/renovate/actions-setup-java-2.x
Update actions/setup-java action to v2.2.0
|
2021-08-10 22:08:40 +02:00 |
|
Renovate Bot
|
df0c6e92ae
|
Update actions/setup-java action to v2.2.0
|
2021-08-09 11:31:50 +00: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 |
|
TheBusyBiscuit
|
850f9e2b74
|
[CI skip] Updated changelog
|
2021-08-05 10:04:30 +02:00 |
|
ybw0014
|
bb147e26ab
|
rename the new tag
|
2021-08-04 20:46:30 +08:00 |
|