TheBusyBiscuit
|
34f24f4d60
|
Invisible and invulnerable might be a good idea.
|
2021-01-15 00:29:28 +01:00 |
|
TheBusyBiscuit
|
d84a2e37a3
|
Lowered purge delay
|
2021-01-15 00:24:23 +01:00 |
|
TheBusyBiscuit
|
a7d0758692
|
More work on holograms
|
2021-01-15 00:16:58 +01:00 |
|
ProfElements
|
58eca5affa
|
Check for conflicting enchantments, this can probably be better
|
2021-01-14 16:02:33 -06:00 |
|
ProfElements
|
fada355fe5
|
Add research and make Book Binder recipe slightly harder
|
2021-01-14 14:39:28 -06:00 |
|
TheBusyBiscuit
|
84d2d99097
|
not done yet
|
2021-01-14 20:44:56 +01:00 |
|
TheBusyBiscuit
|
739e7a7a9a
|
Merge branch 'master' into chore/has-unlocked
|
2021-01-14 14:44:57 +01:00 |
|
TheBusyBiscuit
|
ac590fdde3
|
Fixes #2721
|
2021-01-14 14:41:09 +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 |
|
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
|
2f08066449
|
Merge pull request #2487 from CURVX/fix/sf-machine-hopper
|
2021-01-13 18:46:13 +00: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 |
|
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
|
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
|
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 |
|
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
|
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 |
|
ProfElements
|
23d0f0ae2a
|
Made requested changes.
|
2021-01-07 14:41:59 -06: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 |
|
ProfElements
|
b26376078e
|
Made requested changes. Defaulted has-custom-level to false because no-bypass is true
|
2021-01-06 16:03:44 -06: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 |
|
ProfElements
|
4eda0923bf
|
Make all ItemSettings reasonable values
|
2021-01-04 14:14:30 -06:00 |
|
ProfElements
|
685614803c
|
Add ItemSettings, hasCustomMaxLevel, customMaxLevel. Bypasses vanilla but not a custom defined max
|
2021-01-03 13:53:43 -06:00 |
|
TheBusyBiscuit
|
00902c8738
|
Merge pull request #2666 from Slimefun/chore/craftbukkit-warning
Enforce Server Software requirements
|
2021-01-03 19:50:51 +01:00 |
|
ProfElements
|
62f0019a7f
|
Lower time requirement to deal with large enchantments books (>4 enchantments)
|
2021-01-03 12:36:08 -06:00 |
|
ProfElements
|
fe8b0c21f7
|
Fixed code inconsistencies
|
2021-01-03 12:35:00 -06:00 |
|
TheBusyBiscuit
|
debf201846
|
Started to refactor holograms
|
2021-01-03 18:48:18 +01:00 |
|
ProfElements
|
c162e5194d
|
Merge branch 'master' into master
|
2021-01-03 05:10:28 +00:00 |
|
ProfElements
|
a42af430e3
|
Add deniesVanillaRules ItemSetting, this can make the Book Binder adhere to vanilla rules
|
2021-01-02 22:50:48 -06:00 |
|
ProfElements
|
b23869f037
|
Added Book Binder
|
2021-01-02 22:26:59 -06: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 |
|
TheBusyBiscuit
|
db789f1b0d
|
A little bit of additional refactoring
|
2021-01-01 00:45:05 +01:00 |
|
TheBusyBiscuit
|
f2dd3a0125
|
Fixes #2655
|
2020-12-31 17:38:51 +01:00 |
|
TheBusyBiscuit
|
aa98bd0ba2
|
Fixes #2664
|
2020-12-31 17:08:50 +01:00 |
|
TheBusyBiscuit
|
bd9d496b4d
|
Enforce Server Software requirements
|
2020-12-31 16:33:43 +01:00 |
|
svr333
|
32b9788e74
|
Merge branch 'master' into chore/has-unlocked
|
2020-12-24 12:40:08 +01:00 |
|
Daniel Walsh
|
9c31c746dd
|
Requested changes
|
2020-12-23 22:16:45 +00:00 |
|
Daniel Walsh
|
6cf2051e60
|
Panda smells
|
2020-12-23 14:56:51 +00:00 |
|
Daniel Walsh
|
00c233dee5
|
Move to a method
|
2020-12-23 14:32:47 +00:00 |
|
Daniel Walsh
|
2872cf8a2e
|
Fixed #2647
|
2020-12-23 14:17:35 +00:00 |
|
svr333
|
9c32089eeb
|
Update class description
|
2020-12-22 22:59:30 +01:00 |
|
svr333
|
3c3836a3f5
|
Merge branch master from upstream
|
2020-12-22 22:45:33 +01:00 |
|
svr333
|
f0da074b98
|
Add missing return statement
If we dont add that return statement it can send 2 messages at once
|
2020-12-22 22:26:04 +01:00 |
|
svr333
|
ac09d96b40
|
Merge branch 'master' into fix/sf-machine-hopper
|
2020-12-22 22:02:20 +01:00 |
|
TheBusyBiscuit
|
2cd0378306
|
Thank god we have Unit Tests :monkaS:
|
2020-12-22 15:53:00 +01:00 |
|
TheBusyBiscuit
|
b00afa4790
|
Refactoring
|
2020-12-22 15:47:58 +01:00 |
|
TheBusyBiscuit
|
65fc3cea4e
|
Finalized the fix for #2636
|
2020-12-21 12:27:16 +01:00 |
|
Patbox
|
d7a8903211
|
Temponary fix for #2636
|
2020-12-19 16:30:38 +01:00 |
|
svr333
|
5aa34c7a6e
|
Update recipe
|
2020-12-17 21:05:12 +01:00 |
|
TheBusyBiscuit
|
f755e943c4
|
[CI skip] Refactoring and code cleanup
|
2020-12-17 18:30:51 +01:00 |
|
TheBusyBiscuit
|
2ced45b485
|
Merge pull request #2609 from Slimefun/refactoring/third-party-integrations
Refactored integrations (+ Fixed #2575)
|
2020-12-17 15:30:16 +01:00 |
|
TheBusyBiscuit
|
e6114f7e4b
|
[CI skip] Updated translators list
|
2020-12-17 13:33:23 +01:00 |
|
TheBusyBiscuit
|
3d54080001
|
[CI skip] A bit o refactoring
|
2020-12-12 14:00:11 +01:00 |
|
TheBusyBiscuit
|
498da0e00a
|
[CI skip] Merge pull request #2598 from Slimefun/feature/bee-armor
Added Bee Armor
|
2020-12-11 13:05:20 +01:00 |
|
Senne Van Rompaey
|
3acd6926ad
|
Merge branch 'master' into refactoring/third-party-integrations
|
2020-12-10 22:02:21 +01:00 |
|
Patbox
|
28e5771ca8
|
Implement more suggestions
|
2020-12-10 12:38:31 +01:00 |
|
TheBusyBiscuit
|
0c1485aa7c
|
Merge branch 'master' into fix/sf-machine-hopper
|
2020-12-09 18:42:42 +01:00 |
|
TheBusyBiscuit
|
36be4c29de
|
More refactoring
|
2020-12-09 13:33:34 +01:00 |
|
TheBusyBiscuit
|
7d9e726102
|
More refactoring
|
2020-12-09 12:39:24 +01:00 |
|
TheBusyBiscuit
|
88c81a9cc2
|
Added ItemsAdder support (fixes #2575)
|
2020-12-09 11:41:59 +01:00 |
|
TheBusyBiscuit
|
2e13cd2e88
|
Refactoring for third-party integrations
|
2020-12-08 21:07:48 +01:00 |
|
svr333
|
d571fc5c18
|
Change speed to 45 instead of 90
|
2020-12-06 13:19:02 +01:00 |
|
svr333
|
434d469a0d
|
Add t3 Electric Ore Grinder
|
2020-12-06 02:01:39 +01:00 |
|
TheBusyBiscuit
|
56316426aa
|
Updated to latest Slimefun version
|
2020-12-05 21:50:46 +01:00 |
|
TheBusyBiscuit
|
bd213a7789
|
No idea what that was doing here...
|
2020-12-05 21:45:42 +01:00 |
|
TheBusyBiscuit
|
9504e523f4
|
Merge branch 'master' into feature/bee-armor
|
2020-12-05 21:43:40 +01:00 |
|
Patbox
|
7afb9b9791
|
Implement more suggestions
|
2020-12-05 20:51:30 +01:00 |
|
Patbox
|
ff634c0f5c
|
Make code better
|
2020-12-05 20:22:03 +01:00 |
|
Patbox
|
f4633c528f
|
Fix ghost blocks
|
2020-12-05 17:48:17 +01:00 |
|
TheBusyBiscuit
|
5d15a7e5cf
|
Another small change
|
2020-12-03 10:38:03 +01:00 |
|
TheBusyBiscuit
|
e1a3bf730b
|
Made requested changes
|
2020-12-03 10:34:05 +01:00 |
|
TheBusyBiscuit
|
90df68b0e0
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into optimization/cargo-filters
|
2020-12-03 10:23:18 +01:00 |
|
TheBusyBiscuit
|
96e38608f9
|
Added 4 bricks -> 1 brick block recipe to the Electric Press
|
2020-12-01 16:37:51 +01:00 |
|
TheBusyBiscuit
|
5d0ed3570d
|
Fixes #2583
|
2020-12-01 16:12:57 +01:00 |
|
TheBusyBiscuit
|
ac7bb44d98
|
Fixes #2585
|
2020-12-01 11:46:59 +01:00 |
|
TheBusyBiscuit
|
b4edc6c5bf
|
Fixes #2496
|
2020-11-30 17:39:31 +01:00 |
|
TheBusyBiscuit
|
1d4cb85cb1
|
Fixes #2576
|
2020-11-30 17:03:17 +01:00 |
|
TheBusyBiscuit
|
c4619ecbaa
|
Fixes #2574
|
2020-11-30 15:13:53 +01:00 |
|
TheBusyBiscuit
|
3e645a148f
|
Refactoring
|
2020-11-26 18:21:10 +01:00 |
|
TheBusyBiscuit
|
d0e7e21877
|
Performance and memory improvements
|
2020-11-25 14:27:46 +01:00 |
|
TheBusyBiscuit
|
925cb9d0d1
|
[Ci skip] A small code improvement
|
2020-11-23 18:37:20 +01:00 |
|
TheBusyBiscuit
|
354dd30e52
|
Removed EmeraldEnchants integration
|
2020-11-23 16:58:08 +01:00 |
|
TheBusyBiscuit
|
4a6418cd7d
|
[CI skip] Updated translators list
|
2020-11-23 16:34:47 +01:00 |
|
TheBusyBiscuit
|
497359568e
|
[Ci skip] Refactoring and documentation
|
2020-11-22 14:06:06 +01:00 |
|
CURVX
|
ef09b03af4
|
Blank line
|
2020-11-21 22:51:14 +05:30 |
|
CURVX
|
5e0e9d5490
|
Merge branch 'master' into fix/sf-machine-hopper
|
2020-11-21 22:21:34 +05:30 |
|
CURVX
|
7f385cdc8d
|
Formatting changes
|
2020-11-21 22:17:55 +05:30 |
|
TheBusyBiscuit
|
f689c2fc4f
|
Added an item setting to the Infused Hopper to toggle it with redstone
|
2020-11-21 15:34:09 +01:00 |
|
TheBusyBiscuit
|
3bd595a930
|
Fixes #2421
|
2020-11-21 14:18:54 +01:00 |
|
TheBusyBiscuit
|
55188bfd0a
|
Fixes #2518 (+ refactoring and documentation)
|
2020-11-21 14:06:38 +01:00 |
|
TheBusyBiscuit
|
5bf3e38bae
|
Fixed Armor Stands getting damaged/pushed by Explosive Bow
|
2020-11-20 13:39:25 +01:00 |
|
TheBusyBiscuit
|
1f32b160a5
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java
Co-authored-by: Senne Van Rompaey <vanrompaey.senne@protonmail.com>
|
2020-11-20 03:00:23 +01:00 |
|
TheBusyBiscuit
|
c5f6b53412
|
Updated unit tests for new elapsed time method
|
2020-11-20 00:34:29 +01:00 |
|
TheBusyBiscuit
|
d8563eb5dc
|
Fixed some docs
|
2020-11-19 22:22:42 +01:00 |
|
TheBusyBiscuit
|
f2a6d97f29
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2020-11-19 22:21:01 +01:00 |
|
TheBusyBiscuit
|
15f281504f
|
More performance and memory improvements
|
2020-11-19 22:20:43 +01:00 |
|
TheBusyBiscuit
|
bb764b7584
|
Fixed Guide Settings showing "last activity" as a negative number
|
2020-11-19 21:00:28 +01:00 |
|
TheBusyBiscuit
|
eea3254d11
|
Merge pull request #2555 from wzpzw5/patch-10
Fixed a bug of Duplicate items with BlockPlacer
|
2020-11-19 18:08:02 +01:00 |
|
TheBusyBiscuit
|
8f3cad0419
|
[CI skip] Fixed two color codes related to the Elevator Plate
|
2020-11-19 18:06:17 +01:00 |
|
TheBusyBiscuit
|
8fab8268d4
|
[CI skip] Small change
|
2020-11-19 17:47:50 +01:00 |
|
TheBusyBiscuit
|
7e657c9810
|
A ton of performance improvements
|
2020-11-19 17:42:10 +01:00 |
|
TheBusyBiscuit
|
94752a9027
|
Fixes #2558
|
2020-11-19 15:01:47 +01:00 |
|