1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Commit Graph

8098 Commits

Author SHA1 Message Date
Sefiraat
a45b07342c Fix incorrect return 2023-06-21 08:52:26 +01:00
J3fftw
becbc0b0c0
added block events (#3595)
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
Co-authored-by: Sefiraat <miakis@me.com>
Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-06-20 22:25:27 +01:00
Daniel Walsh
817b6aa9fd [CI Skip] Prep for RC-34 2023-06-20 22:19:56 +01:00
JustAHuman-xD
da9f84925a
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2023-06-16 16:50:07 -05:00
JustAHuman-xD
a17067b358
I accidentally put a colon 🥲 2023-06-16 16:31:38 -05:00
JustAHuman-xD
6520c5f5a6
Remove Ternary
This was on my phone through the GitHub app so I hope everything is correct lol
2023-06-16 16:29:05 -05:00
JustAHuman-xD
d47391cead Add Precondition 2023-06-16 15:03:48 -05:00
renovate[bot]
a86446e236
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.15 2023-06-16 21:46:05 +02:00
renovate[bot]
c91e50aecc
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.15 2023-06-16 21:45:51 +02:00
renovate[bot]
2b338262fc
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.0 2023-06-16 21:45:19 +02:00
Sfiguz7
79e057d2aa
Merge pull request #3853 from JustAHuman-xD/fix/actual-salt-automation 2023-06-15 08:50:57 +02:00
JustAHuman-xD
02e353d0af Refactor & Actually Automate Salt 2023-06-14 16:48:06 -05:00
Sfiguz7
b783afd463
Merge pull request #3847 from Sefiraat/fix/enchantment_amount_fixes
Bandaid because of *someone*
2023-06-11 00:55:15 +02:00
Sefiraat
9f847126a6 Change typo and logic issues with EnchantAmount problems 2023-06-10 19:56:58 +01:00
renovate[bot]
f2e52d7515
[CI skip] Update dependency org.slf4j:slf4j-simple to v2.0.7 2023-06-10 20:00:15 +02:00
Alexander Majka
c82527544f
Added SLF4J-simple to fix warning during tests (#3771) 2023-06-10 18:57:39 +01:00
J3fftw
a9a9203928
1.20 (#3839) 2023-06-10 16:54:57 +01:00
Sefiraat
3c07866697
Merge pull request #3681 from svr333/CrouchCheckLumberAxe
Add Lumber Axe suppression when sneaking
2023-06-10 15:55:47 +01:00
renovate[bot]
a847eec7c4
[CI skip] Update thollander/actions-comment-pull-request action to v2.4.0 2023-06-10 16:54:40 +02:00
renovate[bot]
ee4ac4fd21
[CI skip] Update actions/checkout action to v3.5.3 2023-06-10 16:28:29 +02:00
Sefiraat
39886fc007
Merge pull request #3749 from J3fftw1/feature/maxEnchants
added a way to set max enchants to go on an item
2023-06-09 22:41:38 +01:00
svr333
6e3416bd74
Commit to trigger CI 2023-06-09 17:53:20 +02:00
Sfiguz7
a0e17eb2d2
Merge pull request #3697 from J3fftw1/fix/fix-withers-creating-ghost-blocks 2023-06-08 23:23:33 +02:00
Sfiguz7
1483a77ee5
Merge pull request #3686 from J3fftw1/feature/adds-suggestion-242 2023-06-08 22:59:19 +02:00
Sfiguz7
523f9c9e08
Merge pull request #3794 from Phoenix-Starlight/fix/fire-staff-disenchant 2023-06-08 22:33:55 +02:00
Sfiguz7
53f8988373
Merge pull request #3659 from dniym/patch-1 2023-06-08 22:25:52 +02:00
Sfiguz7
fcb701aacb
Merge pull request #3640 from FN-FAL113/fix/flask-of-knowledge-filling 2023-06-08 22:24:00 +02:00
Sfiguz7
28a3616487
Merge pull request #3639 from FN-FAL113/fix/industrial-miner-bug 2023-06-08 22:20:02 +02:00
TheBusyBiscuit
45346442da
Merge pull request #3828 from test137E29B/fix/set-skin-android-air
Fix android move task, resolves #3443
2023-06-07 21:10:16 +02:00
TheBusyBiscuit
fe3ce1ccac
[CI skip] Update CHANGELOG.md 2023-06-07 21:09:54 +02:00
renovate[bot]
283b7aea94
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.1.2 2023-06-07 20:58:09 +02:00
renovate[bot]
da84e36239
[CI skip] Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.0 2023-06-07 20:57:44 +02:00
renovate[bot]
01011cf0a1
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.220 2023-06-07 20:57:31 +02:00
renovate[bot]
85763d2692
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.1.0 2023-05-20 04:38:51 +02:00
test137e29b
2dd720839e Fix android move task 2023-05-09 21:21:57 +01:00
renovate[bot]
69ecb38c53
[CI skip] Update dependency org.junit.jupiter:junit-jupiter to v5.9.3 2023-04-29 17:14:57 +02:00
renovate[bot]
603c686433
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.10 2023-04-29 17:14:49 +02:00
renovate[bot]
b225a6b83a
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.3.3 2023-04-22 12:26:52 +02:00
renovate[bot]
11c46ec8ed
[CI skip] Update dependency com.github.LoneDev6:itemsadder-api to v3.4.1-r4 2023-04-22 12:26:42 +02:00
renovate[bot]
d2ad2b181c
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.9 2023-04-22 12:26:32 +02:00
renovate[bot]
affa844dfa
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.219 2023-04-22 12:26:23 +02:00
renovate[bot]
beafe0e41f
[CI skip] Update actions/setup-java action to v3.11.0 2023-04-22 12:26:15 +02:00
renovate[bot]
f5f4e56ed5
[CI skip] Update actions/checkout action to v3.5.2 2023-04-22 12:26:05 +02:00
renovate[bot]
7841b5da8a
[CI skip] Update dependency org.mockito:mockito-core to v5.3.1 2023-04-22 12:25:40 +02:00
J3fftw1
d1d67aada9 requested changes 2023-04-14 13:14:17 +02:00
J3fftw1
258e38396c requested changes 2023-04-14 13:13:24 +02:00
J3fftw1
3209ca309c Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/fix-withers-creating-ghost-blocks 2023-04-14 13:04:53 +02:00
renovate[bot]
d860ee56b2
[CI skip] Update actions/checkout action to v3.5.0 2023-03-25 12:40:13 +01:00
renovate[bot]
cb7b14a430
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.14 2023-03-21 15:38:41 +01:00
renovate[bot]
5c2e5867f1
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.14 2023-03-21 15:38:22 +01:00