TheBusyBiscuit
|
3777b59596
|
Merge branch 'master' into fixes/blocks
|
2021-01-11 13:57:33 +01:00 |
|
TheBusyBiscuit
|
bc8d72b9ab
|
Small aesthetic change
|
2021-01-11 13:12:09 +01:00 |
|
TheBusyBiscuit
|
5ed452660f
|
Fixed elevator order (highest floor first)
|
2021-01-11 13:07:46 +01:00 |
|
TheBusyBiscuit
|
f6a9150296
|
Little bit of refactoring
|
2021-01-11 12:45:11 +01:00 |
|
TheBusyBiscuit
|
7a4712f930
|
Removed obsolete things
|
2021-01-11 12:33:49 +01:00 |
|
Daniel Walsh
|
20cecc1d01
|
Merge pull request #2706 from Slimefun/features/inventory-elevator
Inventory selector for elevators
|
2021-01-11 11:13:57 +00:00 |
|
TheBusyBiscuit
|
7bfb46d3fd
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
|
2021-01-11 12:07:46 +01:00 |
|
TheBusyBiscuit
|
85639c75ac
|
Fixed floor numbers
|
2021-01-11 11:25:03 +01:00 |
|
TheBusyBiscuit
|
32474a588b
|
Added ElevatorFloor class from PR #2699
|
2021-01-11 10:56:46 +01:00 |
|
TheBusyBiscuit
|
a313d8a878
|
Removed comments
|
2021-01-11 10:48:54 +01:00 |
|
TheBusyBiscuit
|
e119f762ac
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
features/inventory-elevator
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideLayout.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideLayoutOption.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
|
2021-01-11 10:47:18 +01:00 |
|
TheBusyBiscuit
|
83537facb5
|
Merge pull request #2698 from WalshyDev/fix/broken-book-guide-and-elevator
Inventory selector for elevators
|
2021-01-11 10:37:19 +01:00 |
|
TheBusyBiscuit
|
577ad2c308
|
[CI skip] Prepare RC-19
|
2021-01-11 10:33:12 +01:00 |
|
TheBusyBiscuit
|
4b6610d0b7
|
[CI skip] Finalized guide refactoring
|
2021-01-11 10:30:50 +01:00 |
|
Daniel Walsh
|
d4cfe2a0db
|
Quick fix
|
2021-01-11 07:57:51 +00:00 |
|
Daniel Walsh
|
116642fcec
|
Finish up
|
2021-01-11 07:38:26 +00:00 |
|
TheBusyBiscuit
|
7e48d96fa3
|
Removed "written book" slimefun guide and disabled elevators
|
2021-01-11 02:39:54 +01:00 |
|
TheBusyBiscuit
|
93dc77b188
|
[CI skip] Fixed javadocs
|
2021-01-11 02:14:49 +01:00 |
|
TheBusyBiscuit
|
2943289c6d
|
Merge branch 'master' into fixes/blocks
|
2021-01-10 23:12:34 +01:00 |
|
TheBusyBiscuit
|
c280ec26a0
|
Merge branch 'master' into fix/broken-book-guide-and-elevator
|
2021-01-10 23:09:06 +01:00 |
|
TheBusyBiscuit
|
4c879ac3b3
|
Added AndroidFarmEvent (+ refactored Farmer Androids)
|
2021-01-10 21:20:43 +01:00 |
|
TheBusyBiscuit
|
47fc037536
|
[CI skip] Lots of refactoring and documentation
* Moved the ProtectionManager to the IntegrationsManager
* Refactored static NamespacedKeys to be non-static
* Added some documentation
|
2021-01-10 17:32:47 +01:00 |
|
TheBusyBiscuit
|
f3ed8c0451
|
[CI skip] Refactoring
|
2021-01-10 16:21:15 +01:00 |
|
TheBusyBiscuit
|
177637d070
|
[CI skip] Merge pull request #2703 from Slimefun/gitlocalize-14714
Chinese Taiwan 1/10 (Timings messages and tweaks)
|
2021-01-10 14:36:31 +01:00 |
|
TheBusyBiscuit
|
3392a11883
|
[CI skip] Merge pull request #2702 from Slimefun/gitlocalize-14713
Updated Hungarian translations
|
2021-01-10 14:34:56 +01:00 |
|
TheBusyBiscuit
|
9f3adc1278
|
[CI skip] Refactored some more I had forgotten
|
2021-01-10 14:33:48 +01:00 |
|
TheBusyBiscuit
|
0a71972ca3
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-10 13:07:08 +00:00 |
|
HeroBrineKing
|
3cd6aeaf29
|
Translate messages_zh-TW.yml via GitLocalize
|
2021-01-10 13:07:07 +00:00 |
|
TheBusyBiscuit
|
9c89419d15
|
[CI skip] Missed one
|
2021-01-10 14:02:58 +01:00 |
|
poma123
|
c63e09219d
|
Translate messages_hu.yml via GitLocalize
|
2021-01-10 13:01:44 +00:00 |
|
András Marczinkó
|
b3c72e984a
|
Translate messages_hu.yml via GitLocalize
|
2021-01-10 13:01:43 +00:00 |
|
TheBusyBiscuit
|
22b5421118
|
Fixed /sf timings --verbose not working correctly (+refactoring)
|
2021-01-10 13:38:07 +01:00 |
|
TheBusyBiscuit
|
9ed1b3b651
|
[CI skip] Merge pull request #2701 from Slimefun/gitlocalize-14709
Updated german translations
|
2021-01-10 13:22:34 +01:00 |
|
TheBusyBiscuit
|
0a979f0545
|
Translate recipes_de.yml via GitLocalize
|
2021-01-10 12:17:22 +00:00 |
|
TheBusyBiscuit
|
50a1050038
|
Translate messages_de.yml via GitLocalize
|
2021-01-10 12:17:21 +00:00 |
|
TheBusyBiscuit
|
73ef76b292
|
[CI skip] Merge pull request #2697 from Slimefun/gitlocalize-14666
Update Japanese translation files.
|
2021-01-10 13:08:20 +01:00 |
|
TheBusyBiscuit
|
5c34d26f8d
|
[CI skip] Fixed a typo
|
2021-01-10 13:06:22 +01:00 |
|
TheBusyBiscuit
|
f0b2cb609e
|
[CI skip] Merge pull request #2700 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.1
|
2021-01-10 13:05:30 +01:00 |
|
Renovate Bot
|
ef72305d3f
|
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.1
|
2021-01-09 23:24:15 +00:00 |
|
Daniel Walsh
|
53b6ea131b
|
Fixy fixy fix
|
2021-01-09 21:39:15 +00:00 |
|
bito-blosh
|
59e7b5c6f1
|
Translate recipes_ja.yml via GitLocalize
|
2021-01-09 21:31:23 +00:00 |
|
bito-blosh
|
daea1d54fc
|
Translate messages_ja.yml via GitLocalize
|
2021-01-09 21:31:22 +00:00 |
|
TheBusyBiscuit
|
5dce476dc9
|
Translate messages_ja.yml via GitLocalize
|
2021-01-09 21:31:21 +00:00 |
|
ProfElements
|
93997718c0
|
Make requested changes, removed redundant isCompatible, and make isCompatible return false on else instead of just after the if
|
2021-01-09 15:25:59 -06:00 |
|
Daniel Walsh
|
d80784c6b3
|
Merge pull request #2695 from J3fftw1/feature/changed-version-command
|
2021-01-09 20:41:13 +00:00 |
|
Jeffrey Kosse
|
bee45b2881
|
did requested changes
|
2021-01-09 21:36:12 +01:00 |
|
Daniel Walsh
|
437f9da4bf
|
[CI Skip] Merge pull request #2696 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.10
|
2021-01-09 20:30:43 +00:00 |
|
Daniel Walsh
|
4f5c8da8e2
|
[CI Skip] Merge pull request #2693 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.28
|
2021-01-09 20:30:18 +00:00 |
|
Jeffrey Kosse
|
62285bb858
|
did requested changes
|
2021-01-09 21:28:41 +01:00 |
|
Jeffrey Kosse
|
c9a3cc3787
|
ree
|
2021-01-09 21:27:57 +01:00 |
|