1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

6545 Commits

Author SHA1 Message Date
NatsuHana
a18ee91dd4
docs: add missing changelog 2021-04-05 00:19:33 +08:00
TheBusyBiscuit
bbd41ff70c [CI skip] Fixed 24k carat gold ingot 2021-04-03 19:42:14 +02:00
TheBusyBiscuit
1955d1235b [CI skip] Refactoring 2021-04-03 19:40:54 +02:00
TheBusyBiscuit
b3e5978817
[CI skip] Merge pull request #2932 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.187
2021-04-03 19:40:02 +02:00
Renovate Bot
576aa48bc8
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.187 2021-04-03 17:31:32 +00:00
TheBusyBiscuit
89b8b76fce [CI skip] Refactoring... I said 2021-04-03 15:20:45 +02:00
TheBusyBiscuit
cb05563014 [CI skip] Refactoring
+ Removed unused class
2021-04-03 15:20:08 +02:00
TheBusyBiscuit
18139bb5c4 Fixed Grappling Hook vanishing in creative mode 2021-04-03 14:08:21 +02:00
TheBusyBiscuit
5e87df873c Fixes #2926 2021-04-03 14:01:48 +02:00
TheBusyBiscuit
5b517ea1b1
[CI skip] Updated changelog 2021-04-03 13:32:25 +02:00
RobotHanzo
dcf411032e Fixes 2021-04-03 19:25:22 +08:00
RobotHanzo
d428375132
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 19:21:52 +08:00
RobotHanzo
a268088d59 Even more advanced enum 2021-04-03 19:13:12 +08:00
RobotHanzo
d61ebb6c19 Fix catastrophe 2021-04-03 16:11:37 +08:00
RobotHanzo
13e17beab4 Merge remote-tracking branch 'origin/fix/unbreaking-misbehaviour' into fix/unbreaking-misbehaviour 2021-04-03 16:10:35 +08:00
RobotHanzo
7e76392535 Test improvement 2021-04-03 16:10:18 +08:00
RobotHanzo
cceb2af054
Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/mocks/DamageableMock.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 16:09:27 +08:00
RobotHanzo
c56713ed7d Now using enum 2021-04-03 16:07:41 +08:00
Daniel Walsh
16674a38c1
[CI Skip] Merge pull request #2931 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.186
2021-04-03 07:34:21 +01:00
Renovate Bot
aab6ea7a93
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.186 2021-04-03 03:59:50 +00:00
Daniel Walsh
cbaad1267e
[CI Skip] Merge pull request #2864 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.185
2021-04-02 21:18:06 +01:00
Renovate Bot
b5397968e6
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.185 2021-04-02 16:00:47 +00:00
RobotHanzo
11fded46db Overridable durability RNG 2021-04-02 22:16:25 +08:00
RobotHanzo
6d12d1f7ac Move classes out 2021-04-02 21:53:05 +08:00
RobotHanzo
f9201b648a Unused imp. 2021-04-02 21:48:44 +08:00
RobotHanzo
53b38e51be
Fix mistakes 2021-04-02 21:11:42 +08:00
RobotHanzo
61224ec686
Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/TestDamageableItem.java
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
2021-04-02 20:57:03 +08:00
RobotHanzo
a000c92d93 Null checks 2021-04-02 20:50:28 +08:00
RobotHanzo
8b9705a0b4 Added a test 2021-04-02 20:47:29 +08:00
RobotHanzo
1bc51f4d80 Fixes #2837 2021-04-02 17:40:00 +08:00
TheBusyBiscuit
0b6bbb453e
[CI skip] Merge pull request #2928 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.33.0
2021-04-02 00:50:08 +02:00
Renovate Bot
7d2c71d47e
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.33.0 2021-04-01 21:06:19 +00:00
TheBusyBiscuit
0bec76f6e0
[CI skip] Merge pull request #2925 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.184
2021-04-01 12:35:11 +02:00
Renovate Bot
92188d94e8
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.184 2021-03-31 23:44:23 +00:00
TheBusyBiscuit
ee8d421189 Ancient Pedestals can now be found under "Magical Gadgets" 2021-03-31 19:13:21 +02:00
TheBusyBiscuit
ca3715a0dc Added Crafting Motor (crafting ingredient for Auto-Crafters)
Also retextured the Cargo Motor
2021-03-31 19:02:34 +02:00
TheBusyBiscuit
816cc0613b Added "Slimeballs -> Slime Block" recipe to Electric Press 2021-03-31 18:31:59 +02:00
TheBusyBiscuit
61f0fa5d0d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-03-31 18:30:04 +02:00
TheBusyBiscuit
32c60ad5ac [CI skip] Refactoring 2021-03-31 18:29:43 +02:00
TheBusyBiscuit
0ee724e1e5
Merge pull request #2919 from GallowsDove/master
Fixed damageable items not respecting `unbreakable` tag
2021-03-31 17:20:50 +02:00
TheBusyBiscuit
5ce2283141
[CI skip] Updated changelog 2021-03-31 17:20:18 +02:00
TheBusyBiscuit
c3722bcb62
Merge pull request #2924 from J3fftw1/feature/empty-message-multiblocks
Added a new message to multiblocks to see if inventory is empty
2021-03-31 16:51:54 +02:00
J3fftw
567b5397cf
Update src/main/resources/languages/messages_en.yml
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-03-31 15:36:19 +02:00
Jeffrey Kosse
5649f95174 Added a new message to multiblocks to see if inventory is empty 2021-03-31 14:37:24 +02:00
TheBusyBiscuit
f157f96213
[CI skip] Merge pull request #2923 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.183
2021-03-31 09:32:27 +02:00
TheBusyBiscuit
3b11db60d5
[CI skip] Merge pull request #2922 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.32.2
2021-03-31 09:32:15 +02:00
Renovate Bot
d6ff59cfb4
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.183 2021-03-31 00:00:26 +00:00
Renovate Bot
a019d3892f
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.32.2 2021-03-30 11:18:14 +00:00
GallowsDove
ae7c22703e
requested changes 2021-03-29 20:39:55 +02:00
GallowsDove
062adb4cb7
Hopefully improved code 2021-03-28 22:49:45 +02:00