TheBusyBiscuit
|
84d2d99097
|
not done yet
|
2021-01-14 20:44:56 +01:00 |
|
TheBusyBiscuit
|
029bc2ae78
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
refactoring/holograms
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
|
2021-01-13 14:29:18 +01:00 |
|
TheBusyBiscuit
|
6e27ea0ca1
|
[CI skip] Fixed javadocs
|
2021-01-13 13:48:56 +01:00 |
|
TheBusyBiscuit
|
7339a6ed4b
|
[CI skip] Refactoring
|
2021-01-13 02:20:32 +01:00 |
|
TheBusyBiscuit
|
ec8eed58f9
|
[CI skip] Refactoring
|
2021-01-12 19:28:12 +01:00 |
|
TheBusyBiscuit
|
3f5fb7c7a7
|
[Ci skip] Fixed javadocs and improved documentation
|
2021-01-12 12:03:02 +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 |
|
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
|
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
|
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
|
9f3adc1278
|
[CI skip] Refactored some more I had forgotten
|
2021-01-10 14:33:48 +01:00 |
|
TheBusyBiscuit
|
9c89419d15
|
[CI skip] Missed one
|
2021-01-10 14:02:58 +01:00 |
|
TheBusyBiscuit
|
22b5421118
|
Fixed /sf timings --verbose not working correctly (+refactoring)
|
2021-01-10 13:38:07 +01:00 |
|
Daniel Walsh
|
53b6ea131b
|
Fixy fixy fix
|
2021-01-09 21:39:15 +00:00 |
|
Daniel Walsh
|
d80784c6b3
|
Merge pull request #2695 from J3fftw1/feature/changed-version-command
|
2021-01-09 20:41:13 +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 |
|
Daniel Walsh
|
6fcc69bacc
|
[CI Skip] Merge pull request #2687 from Slimefun/features/verbose-flag
|
2021-01-09 20:27:26 +00:00 |
|
Jeffrey Kosse
|
4a281c87bc
|
ree
|
2021-01-09 21:27:12 +01:00 |
|
Jeffrey Kosse
|
413a74ece4
|
added annotations
|
2021-01-09 21:25:26 +01:00 |
|
Jeffrey Kosse
|
1b52417380
|
removed unused import
|
2021-01-09 21:23:50 +01:00 |
|
Jeffrey Kosse
|
a5f42f31dd
|
Changed VersionsCommand to give more info
|
2021-01-09 20:18:09 +01:00 |
|
TheBusyBiscuit
|
f9cfe03a9f
|
[CI skip] Updated translators list
|
2021-01-07 13:56:10 +01:00 |
|
TheBusyBiscuit
|
47fec04ab6
|
Small performance optimization for cargo networks
|
2021-01-07 11:19:48 +01:00 |
|
TheBusyBiscuit
|
5fae6f1c37
|
[CI skip] Updated translators list
|
2021-01-06 20:57:58 +01:00 |
|
TheBusyBiscuit
|
10b11e7bdf
|
Made requested changes
|
2021-01-06 18:10:32 +01:00 |
|
TheBusyBiscuit
|
318c154e78
|
Fixed locale path
|
2021-01-06 17:56:03 +01:00 |
|
TheBusyBiscuit
|
4f21d06c69
|
Added verbose flag to /sf timings
|
2021-01-06 17:52:46 +01:00 |
|
TheBusyBiscuit
|
75b72eb630
|
Removed deprecated stuff
|
2021-01-06 16:26:40 +01:00 |
|
TheBusyBiscuit
|
74f8204b75
|
[Ci skip] Refactoring
|
2021-01-06 14:23:49 +01:00 |
|
TheBusyBiscuit
|
a1ce83b58a
|
[CI skip] Removed redundant modifiers
|
2021-01-06 12:24:56 +01:00 |
|
TheBusyBiscuit
|
00902c8738
|
Merge pull request #2666 from Slimefun/chore/craftbukkit-warning
Enforce Server Software requirements
|
2021-01-03 19:50:51 +01:00 |
|
TheBusyBiscuit
|
debf201846
|
Started to refactor holograms
|
2021-01-03 18:48:18 +01:00 |
|
TheBusyBiscuit
|
c637b2fd0c
|
[CI skip] Updated translators list
|
2021-01-02 20:43:29 +01:00 |
|
TheBusyBiscuit
|
df2dce0c95
|
[CI skip] Updated translators list
|
2021-01-02 20:35:54 +01:00 |
|