TheBusyBiscuit
|
ae4e4bed73
|
Merge branch 'master' into fixes/blocks
|
2021-01-14 12:35:57 +01:00 |
|
TheBusyBiscuit
|
5d28261626
|
[CI skip] Fix discord webhook
|
2021-01-14 12:32:21 +01:00 |
|
TheBusyBiscuit
|
452dc5c3c5
|
Updated changelog
|
2021-01-14 12:26:21 +01:00 |
|
TheBusyBiscuit
|
5d4e22c4b5
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
chore/has-unlocked
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/LockedCategory.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java
src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
|
2021-01-14 12:25:37 +01:00 |
|
TheBusyBiscuit
|
7826b2359a
|
Finished fix for #2636 and fixed a threading issue with BlockStates
|
2021-01-14 11:58:52 +01:00 |
|
TheBusyBiscuit
|
43109ab2d3
|
Merge branch 'master' into performance/cobblestone
|
2021-01-14 11:16:39 +01:00 |
|
TheBusyBiscuit
|
42631a1165
|
[CI skip] Removed URL checker
|
2021-01-14 11:08:56 +01:00 |
|
TheBusyBiscuit
|
552abb31d6
|
[CI skip] Merge pull request #2718 from Slimefun/renovate/superkogito-urls-checker-0.x
Update SuperKogito/URLs-checker action to v0.2.2
|
2021-01-14 11:03:31 +01:00 |
|
Renovate Bot
|
3fe60b91c7
|
Update SuperKogito/URLs-checker action to v0.2.2
|
2021-01-13 22:07:20 +00:00 |
|
ProfElements
|
23049b64fa
|
Make request changes, simpliflied BookBinder
|
2021-01-13 15:25:28 -06:00 |
|
ProfElements
|
088a08952b
|
Make requested changes, made combineEnchantments better generally
|
2021-01-13 14:35:17 -06:00 |
|
Daniel Walsh
|
9be11921c7
|
Merge branch 'master' into fixes/blocks
|
2021-01-13 18:50:06 +00:00 |
|
TheBusyBiscuit
|
d8004510e5
|
Updated changelog (fixed two bugs)
|
2021-01-13 19:48:30 +01:00 |
|
Daniel Walsh
|
2f08066449
|
Merge pull request #2487 from CURVX/fix/sf-machine-hopper
|
2021-01-13 18:46:13 +00:00 |
|
TheBusyBiscuit
|
0ae418250b
|
[CI skip] Merge pull request #2716 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2
|
2021-01-13 17:38:40 +01:00 |
|
Renovate Bot
|
c53d87d064
|
Update dependency com.github.LoneDev6:itemsadder-api to v2
|
2021-01-13 16:31:00 +00:00 |
|
TheBusyBiscuit
|
4494a32826
|
[CI skip] Updated diagram
|
2021-01-13 15:55:12 +01:00 |
|
TheBusyBiscuit
|
f9a138b79c
|
[CI skip] Added Triage workflow
|
2021-01-13 15:33:29 +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
|
faa3219add
|
Added an additional item warning for illegal stack sizes
|
2021-01-13 13:15:05 +01:00 |
|
TheBusyBiscuit
|
11a368f97e
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-01-13 12:46:35 +01:00 |
|
TheBusyBiscuit
|
b0f5768443
|
[CI skip] Removed a deprecated method
|
2021-01-13 12:46:16 +01:00 |
|
TheBusyBiscuit
|
89f6b69e80
|
[CI skip] Merge pull request #2713 from Slimefun/gitlocalize-14728
Updated and improve zh-CN Translation
|
2021-01-13 12:19:25 +01:00 |
|
TheBusyBiscuit
|
69df04f128
|
Remove as much old stuff as possible
|
2021-01-13 11:58:54 +01:00 |
|
Nameless
|
a69226dd76
|
Translate messages_zh-CN.yml via GitLocalize
|
2021-01-13 05:23:28 +00:00 |
|
CURVX
|
889ffe4872
|
Few minor changes
|
2021-01-13 10:31:45 +05:30 |
|
TheBusyBiscuit
|
f602c6c575
|
Slimefun but without cs-corelib
|
2021-01-13 02:51:05 +01:00 |
|
TheBusyBiscuit
|
7339a6ed4b
|
[CI skip] Refactoring
|
2021-01-13 02:20:32 +01:00 |
|
TheBusyBiscuit
|
17d11b513e
|
Merge branch 'master' into fixes/blocks
|
2021-01-12 19:53:48 +01:00 |
|
TheBusyBiscuit
|
ec8eed58f9
|
[CI skip] Refactoring
|
2021-01-12 19:28:12 +01:00 |
|
CURVX
|
a0ab148a65
|
Cleaned imports pt.2
|
2021-01-12 23:42:19 +05:30 |
|
CURVX
|
f0e891134b
|
Cleaned imports
|
2021-01-12 23:17:23 +05:30 |
|
CURVX
|
19e2f37ac6
|
Resolve merge conflicts
|
2021-01-12 21:51:31 +05:30 |
|
CURVX
|
b3b7a22ee9
|
Changes req. by TTB
|
2021-01-12 21:42:53 +05:30 |
|
CURVX
|
105a57fb37
|
Merge pull request #6 from Slimefun/master
[CI skip] Update fork
|
2021-01-12 21:37:20 +05:30 |
|
TheBusyBiscuit
|
3f5fb7c7a7
|
[Ci skip] Fixed javadocs and improved documentation
|
2021-01-12 12:03:02 +01:00 |
|
TheBusyBiscuit
|
c92ba89d9a
|
Merge branch 'master' into performance/cobblestone
|
2021-01-11 13:58:21 +01:00 |
|
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 |
|