TheBusyBiscuit
34d18c5547
Merge branch 'master' into refactoring/holograms
2021-01-16 11:34:24 +01:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items
2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22
Fixes #2728
2021-01-16 11:30:39 +01:00
TheBusyBiscuit
e523d7849e
Fixes #2662
2021-01-16 11:28:38 +01:00
Daniel Walsh
da2419d414
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
2021-01-16 10:26:22 +00:00
TheBusyBiscuit
d678977a03
Fixed formatting, import and small optimization
2021-01-15 11:52:56 +01:00
TheBusyBiscuit
a810458345
[CI skip] Small changes
2021-01-15 11:46:40 +01:00
TheBusyBiscuit
3663a7d43b
Proper error handling and updated changelog
2021-01-15 03:31:33 +01:00
TheBusyBiscuit
1997fe04d8
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms
2021-01-15 03:12:41 +01:00
TheBusyBiscuit
5ea34a895d
Fixed holograms cache
2021-01-15 01:37:55 +01:00
TheBusyBiscuit
3ea2fccf25
Fixed docs
2021-01-15 01:34:56 +01:00
TheBusyBiscuit
570908a448
Cache entity names
2021-01-15 01:32:39 +01:00
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
05b67869a8
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
features/multi-categories
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java
2021-01-14 12:41:53 +01:00
TheBusyBiscuit
ae4e4bed73
Merge branch 'master' into fixes/blocks
2021-01-14 12:35:57 +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
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
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
TheBusyBiscuit
faa3219add
Added an additional item warning for illegal stack sizes
2021-01-13 13:15:05 +01:00
TheBusyBiscuit
b0f5768443
[CI skip] Removed a deprecated method
2021-01-13 12:46:16 +01:00
TheBusyBiscuit
69df04f128
Remove as much old stuff as possible
2021-01-13 11:58:54 +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
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
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
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
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
edd1283dcc
made requested changes
2021-01-06 21:12:22 +01:00
TheBusyBiscuit
e36027fb48
Merge branch 'master' into fixes/blocks
2021-01-06 21:06:26 +01:00
TheBusyBiscuit
5fae6f1c37
[CI skip] Updated translators list
2021-01-06 20:57:58 +01:00
TheBusyBiscuit
e773e68b4a
Merge branch 'master' into performance/cobblestone
2021-01-06 20:24:54 +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
308367c5e1
Properly register categories
2021-01-03 20:48:46 +01:00
TheBusyBiscuit
ca86f1c641
Finished Multi Categories maybe?
2021-01-03 20:26:58 +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
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
TheBusyBiscuit
77c5630797
First implementation of a MultiCategory
2020-12-27 16:19:37 +01:00
svr333
c53837a0de
Remove redundant whiteline
2020-12-24 17:43:11 +01:00
TheBusyBiscuit
e88682c13b
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/InfiniteBlockGenerator.java
2020-12-24 16:17:20 +01:00
TheBusyBiscuit
2199fb2cd0
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockPhysicsListener.java
2020-12-24 16:15:47 +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
bd06d0daec
Wrong import
2020-12-22 15:58:18 +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
2ff24c2889
Fixed compilation
2020-12-17 19:45:43 +01:00
TheBusyBiscuit
26a64004d2
Merge branch 'master' into fixes/blocks
2020-12-17 19:42:56 +01:00
TheBusyBiscuit
f755e943c4
[CI skip] Refactoring and code cleanup
2020-12-17 18:30:51 +01:00
TheBusyBiscuit
8c8685b6de
Merge branch 'master' into fixes/blocks
2020-12-17 15:35:57 +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
dbaca5f7aa
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2020-12-16 15:53:50 +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
TheBusyBiscuit
3c72abad7b
Merge branch 'master' into fixes/blocks
2020-12-10 22:05:25 +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
eac09eea9e
Switched to BlockFormEvent
2020-12-10 12:11:25 +01:00
TheBusyBiscuit
b07a54d515
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into performance/cobblestone
2020-12-10 12:04:48 +01:00
TheBusyBiscuit
7b0f9c1300
Fixed naming
2020-12-10 00:22:14 +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
TheBusyBiscuit
080bc42130
Updated more implementations
2020-12-05 21:35:43 +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
175a79ebdc
Registered missing Listener
2020-12-05 14:36:04 +01:00
TheBusyBiscuit
036c156f40
Some more changes
2020-12-05 14:21:14 +01:00
TheBusyBiscuit
c84200d2c4
Some stuff + fixes #2560
2020-12-05 13:54:46 +01:00
TheBusyBiscuit
282367d6ff
[CI skip] Removed an old version of bStats
2020-12-03 15:51:17 +01:00
TheBusyBiscuit
96c4d9081c
Merge pull request #2503 from Slimefun/optimization/cargo-filters
...
Cargo Net Optimization: Cached Item Filters
2020-12-03 15:41:35 +01:00
TheBusyBiscuit
e717b77ddc
[CI skip] Might as well push this today
2020-12-03 15:28:58 +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
TheBusyBiscuit
c8d60ddc7b
Merge pull request #2494 from CURVX/fix/hopper-on-brew fixes #2447
...
Fixes brewing potion from Slimefun dusts using hopper
2020-11-19 14:46:39 +01:00
TheBusyBiscuit
86715cd3d0
Fixed CoreProtect not recognizing Slimefun blocks getting broken
2020-11-19 13:11:30 +01:00
TheBusyBiscuit
64fd5a54c3
Added an item setting to configure the Wind Staff velocity
2020-11-19 12:49:42 +01:00
TheBusyBiscuit
a18317295a
[CI skip] Refactoring
2020-11-19 12:45:35 +01:00
wzpzw5
024dbf4fc5
Update BlockPlacer.java
2020-11-18 01:37:54 +00:00
wzpzw5
d76f77cd84
Update BlockPlacer.java
2020-11-18 01:21:59 +00:00
wzpzw5
965e348695
Update BlockPlacer.java
2020-11-17 01:13:03 +00:00
wzpzw5
3db77a0081
Fixed a bug of Duplicate items with BlockPlacer
...
Fixed a bug of Duplicate items with BlockPlacer's delay
on BlockPlacer place an item, just take out the item when it place,then one in hand and
another is placed
2020-11-17 00:01:04 +00:00
TheBusyBiscuit
0cdd21f6bb
Added a config option to delete excess cargo network items
2020-11-15 16:29:45 +01:00
Moritz Kempe
6cddd2b817
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master
2020-11-15 08:58:34 +01:00
TheBusyBiscuit
0b9ab8b6cc
Fixes #2446
2020-11-14 18:44:07 +01:00
TheBusyBiscuit
503dbc8367
Fixes #2418
2020-11-14 18:32:53 +01:00
CURVX
527dfb2b79
Been a while
2020-11-12 22:20:36 +05:30
CURVX
c4a08fe991
Changes req by TTB
2020-11-12 18:32:18 +05:30
TheBusyBiscuit
f1d4b50b67
One more tweak
2020-11-10 01:09:50 +01:00
TheBusyBiscuit
97cbe72a91
Some tweaks to the experimental bee wings
2020-11-10 01:04:15 +01:00
TheBusyBiscuit
e5b2924bee
Finished Bee Wings
2020-11-10 00:56:06 +01:00
TheBusyBiscuit
f3cf421f0e
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into bee-armor
2020-11-10 00:40:59 +01:00
TheBusyBiscuit
05e983917a
Added CoolerFeedPlayerEvent
2020-11-10 00:36:38 +01:00
TheBusyBiscuit
a5704aee3f
Merge pull request #2388 from svr333/MoreTalismans
...
More talismans
2020-11-08 23:35:40 +01:00
TheBusyBiscuit
4d00ffc9af
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes
2020-11-05 00:08:04 +01:00
TheBusyBiscuit
933bd9d9b9
Merge branch 'code-quality/abstract-classes' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes
2020-11-05 00:07:50 +01:00
TheBusyBiscuit
f8306f0693
Small addition
2020-11-05 00:07:37 +01:00
TheBusyBiscuit
3170f143a2
Added a config option to disable network visualizations
2020-11-04 11:18:06 +01:00
TheBusyBiscuit
b80d8cfeda
[CI skip] Updated translators
2020-11-03 18:28:08 +01:00
TheBusyBiscuit
e7f7a4d392
Merge pull request #2462 from uiytt/canUnlockResearchEvent
...
Added PlayerPreResearchEvent
2020-11-03 09:41:42 +01:00
uiytt
54ebfbb18c
Last formatting fix
2020-11-02 20:06:03 +01:00
TheBusyBiscuit
d69cf78331
Merge branch 'master' into MoreTalismans
2020-11-02 15:12:56 +01:00
TheBusyBiscuit
1c5f2f650b
Some refactoring and small fixes
2020-11-02 15:10:56 +01:00
TheBusyBiscuit
be001baa6e
[CI skip] Merge pull request #2508 from Sfiguz7/master
...
Smallest documentation fix ever
2020-11-02 12:38:37 +01:00
Sfiguz7
22fd9e549f
Removed link from brewing stand
2020-11-02 01:04:53 +01:00
TheBusyBiscuit
25c3368ad3
Merge branch 'master' into code-quality/abstract-classes
2020-11-01 21:06:35 +01:00
TheBusyBiscuit
8536965962
Fixes #2517
2020-11-01 20:59:34 +01:00
TheBusyBiscuit
6ced4d166e
Fixes #2527
2020-11-01 20:12:34 +01:00
TheBusyBiscuit
f2200cee44
[CI skip] Merge pull request #2516 from svr333/RenameMessage
...
Change not-valid to invalid
2020-10-31 10:08:48 +01:00
TheBusyBiscuit
db673e0fb1
Forgotten a bracket 👀
2020-10-30 23:12:41 +01:00
TheBusyBiscuit
17e0d0ef1a
Update TalismanListener.java
2020-10-30 23:10:07 +01:00
TheBusyBiscuit
3471932050
Update Talisman.java
2020-10-30 23:05:55 +01:00
TheBusyBiscuit
e953eb1c81
Refactored talisman grabbing method
2020-10-30 23:03:44 +01:00
TheBusyBiscuit
6f39ef5b41
Fixed imports
2020-10-30 23:01:06 +01:00
TheBusyBiscuit
bae560bd5d
More formatting
2020-10-30 22:58:57 +01:00
TheBusyBiscuit
21d6281ecd
Some formatting
2020-10-30 22:57:27 +01:00
TheBusyBiscuit
192258fb74
Merge branch 'master' into MoreTalismans
2020-10-30 22:54:36 +01:00
TheBusyBiscuit
210c8d20f4
Fixes #2499
2020-10-30 22:50:16 +01:00
TheBusyBiscuit
24e344e219
Fixed compatibility
2020-10-30 19:58:31 +01:00
TheBusyBiscuit
a3fb6c044b
Fixed logging
2020-10-30 19:54:34 +01:00
TheBusyBiscuit
08d1def90c
Fixed a small mistake
2020-10-30 19:50:05 +01:00
TheBusyBiscuit
f197e26a9c
Did not mean to make this final yet
2020-10-30 19:42:58 +01:00
TheBusyBiscuit
508b5aa198
Refactored AGenerator
2020-10-30 19:37:39 +01:00
TheBusyBiscuit
d6567e4bfa
Refactored AContainer
2020-10-30 19:31:22 +01:00
Moritz Kempe
8324f5d830
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master
2020-10-30 13:25:44 +01:00
svr333
33f0d0a4bc
Change not-valid to invalid
2020-10-29 15:06:52 +01:00
TheBusyBiscuit
12e7205280
[Ci skip] Added some unit tests
2020-10-28 12:52:23 +01:00
TheBusyBiscuit
28dda7caea
Merge pull request #2473 from CURVX/fix/armor-forge fixes #2469
...
Fixes ArmorForge
2020-10-28 12:15:34 +01:00
TheBusyBiscuit
6ad3b55e81
Merge pull request #2510 from Mooy1/Fix
...
Fixes #2509
2020-10-28 12:14:52 +01:00
TheBusyBiscuit
232ee74ceb
Fixed contributors menu not showing everyone
2020-10-28 01:01:25 +01:00
TheBusyBiscuit
b3befbda49
Some code cleanup, documentation and paper optimizations
2020-10-28 00:44:35 +01:00
Mooy1
d8d98982b2
Update AContainer.java
2020-10-27 09:13:25 -05:00
Mooy1
7c39dbc3af
this gud idk
2020-10-26 09:09:22 -05:00
Mooy1
9f88f24d40
Update src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2020-10-26 08:51:20 -05:00
Mooy1
8608b9223d
Fixes
2020-10-25 22:52:27 -05:00
Sfiguz7
386a9b6b95
Smallest documentation fix ever
2020-10-25 19:00:30 +01:00
TheBusyBiscuit
487108df14
Fixes #2505
2020-10-25 14:40:05 +01:00
TheBusyBiscuit
31b912ac70
Oops, forgot to commit that line
2020-10-25 11:55:27 +01:00
TheBusyBiscuit
7f9bed54ff
Added some documentation and two guide item ui ids
2020-10-25 11:54:45 +01:00
TheBusyBiscuit
e9ad3ee357
Finished Cargo Filter implementation
2020-10-25 02:47:25 +02:00
Seggan
a7cbea70c2
Added validation
2020-10-24 13:30:32 -04:00
Seggan
9dfc4bdcf4
Removed redundant check
2020-10-24 13:23:44 -04:00
Seggan
7a877cda66
Instruction is now public
2020-10-24 13:08:03 -04:00
Seggan
88096ff7c4
Changed get and set scripts to public (from protected)
2020-10-24 13:00:11 -04:00
uiytt
e13694c063
Fixed name
2020-10-23 19:05:32 +02:00
uiytt
f6a3366aac
imports order
2020-10-23 17:36:58 +02:00
uiytt
c56a55dd69
Again Formatting fix
...
I will never see the end of these things ...
2020-10-23 17:31:27 +02:00
CURVX
f5af271445
Little refractoring, changes req. by TTB
2020-10-22 23:58:54 +05:30
uiytt
95a2dc08d4
Formatting fix
2020-10-22 16:06:11 +02:00
svr333
03edaa53a3
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
2020-10-21 22:29:18 +02:00
svr333
6a250d6d00
Fix requested changes
2020-10-21 22:28:59 +02:00
Moritz Kempe
d15be35e0b
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master
2020-10-21 08:12:41 +02:00
CURVX
4f762b37b6
Fixes#2447
2020-10-20 22:48:53 +05:30
Mooy1
536c5af857
Update ContributorsMenu.java
2020-10-20 10:34:35 -05:00
Mooy1
4d6d031bca
fix empty slot
2020-10-20 08:56:53 -05:00
TheBusyBiscuit
24806ab5d0
Adjusted CargoNet implementation
2020-10-20 14:22:17 +02:00
TheBusyBiscuit
aaec763a78
Added ItemFilter
2020-10-20 13:56:21 +02:00
CURVX
71ca1458fe
Changes req. by TTB
2020-10-20 00:32:20 +05:30
CURVX
f651f960c0
Made ArmorForge extend BackpackCrafter
2020-10-19 22:56:14 +05:30
TheBusyBiscuit
c7960c292c
Merge pull request #2479 from CURVX/fix/ender-boots fixes #2478
...
Fixes damage taken from Enderpearl with Enderboot on
2020-10-19 12:49:58 +02:00
Moritz Kempe
e9d2d28c43
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master
2020-10-19 07:36:07 +02:00
TheBusyBiscuit
1998c7746f
Merge pull request #2477 from J3fftw1/fix/#2470
...
fixes #2470
2020-10-18 19:22:04 +02:00
CURVX
c98292b08c
Added changes req. by TTB
2020-10-18 22:32:36 +05:30
Panda.com
e3df3ab012
added tall_flowers.json and requested changes
2020-10-18 15:47:47 +02:00
Panda.com
dc025c7b28
fix
2020-10-18 14:31:54 +02:00
TheBusyBiscuit
734b853eb7
[CI skip] Reduced technical debt
2020-10-18 13:53:15 +02:00
Panda.com
3d364ee331
did requested changes
2020-10-18 13:48:38 +02:00
TheBusyBiscuit
e054fe6682
Fixes #2448
2020-10-18 13:17:18 +02:00
TheBusyBiscuit
c4bf0ecdd2
First step towards a task
2020-10-18 01:44:32 +02:00
TheBusyBiscuit
07eba9319a
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
bee-armor
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
2020-10-17 13:28:30 +02:00
TheBusyBiscuit
9f3e2bba7c
[CI skip] Removed a troublesome config setting
2020-10-17 13:22:22 +02:00
TheBusyBiscuit
b08532b2e5
Merge branch 'master' into master
2020-10-17 13:20:31 +02:00
TheBusyBiscuit
4aff61f3b1
Removed 1.13 support
2020-10-17 12:54:36 +02:00
TheBusyBiscuit
b976370d97
Reverted deprecation warning
2020-10-17 12:07:21 +02:00
Moritz Kempe
92696226e4
fixes PR Explosive tools not working with silk touch
...
Explosive Tools no longer ignore their SILK_TOUCH enchantment.
Fixes PR #2460
2020-10-17 11:58:56 +02:00
uiytt
0a18c30890
Removed now useless method : research
2020-10-15 17:38:59 +02:00
TheBusyBiscuit
954b0075e6
[CI skip] Added package-info.json
2020-10-15 14:15:37 +02:00
TheBusyBiscuit
e18c7cb245
Fixed a dupe bug with mcMMO
2020-10-15 13:50:12 +02:00
uiytt
19133a05f9
Added guideClickInteraction method
...
Added a method in research which manage what to do when a player click on a un-researched item in a guide
2020-10-14 18:28:54 +02:00
CURVX
35fc23c428
Redundant import
2020-10-14 21:40:49 +05:30
CURVX
1437a8d555
Added FakeInv in ArmorForge
2020-10-14 21:34:57 +05:30
uiytt
08b32ce89f
Typo fix
2020-10-14 17:39:16 +02:00
TheBusyBiscuit
b88bad3ef6
Fixes #2452
2020-10-14 14:56:52 +02:00
TheBusyBiscuit
42f849d891
Fixes #2423
2020-10-14 13:31:02 +02:00
TheBusyBiscuit
8440143f41
Refactoring
2020-10-14 13:20:12 +02:00
TheBusyBiscuit
1ffe2fd493
Fixes #2411
2020-10-14 00:51:21 +02:00
TheBusyBiscuit
de1eaca1dc
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2020-10-14 00:24:52 +02:00
TheBusyBiscuit
19de4c8476
Fixes #2454 (Added mcMMO support)
2020-10-14 00:24:01 +02:00
TheBusyBiscuit
bebb514635
Merge pull request #2467 from CURVX/fix/nether-goo-sheep
...
Nether Goo "Tainted Sheep"
2020-10-13 23:27:55 +02:00
TheBusyBiscuit
5c0b7e2ee2
Fixes #2468
2020-10-13 21:44:24 +02:00
CURVX
5982d9faaa
Missed extra Parenthesis
2020-10-14 00:58:24 +05:30
CURVX
fdc958b6d8
Changes requested by TBB
2020-10-14 00:45:53 +05:30
CURVX
317477cd2c
Tainted Sheep
2020-10-13 20:13:44 +05:30
TheBusyBiscuit
5aa300b0be
Merge pull request #2456 from Sfiguz7/master resolves #2369
...
Added Basalt + Blackstone to Crucible
2020-10-13 01:52:43 +02:00
uiytt
916d2bf4ba
Removed empty line
2020-10-12 22:21:33 +02:00
uiytt
cd8603a6d8
Formatting fix
2020-10-12 22:12:37 +02:00
Senne Van Rompaey
db95cca3fb
Merge branch 'master' into MoreTalismans
2020-10-12 19:59:16 +02:00
uiytt
9ded6d1ac4
Added PreCanUnlockResearchEvent
...
This event is called when a player click to unlock a research
2020-10-12 19:19:31 +02:00
TheBusyBiscuit
9e3ce9faf1
[CI skip] Formatting
2020-10-12 16:39:06 +02:00
Sfiguz7
2a8c0f7f82
Moved imports.
2020-10-12 16:25:22 +02:00
TheBusyBiscuit
9b1d6367b3
Some lore changes
2020-10-12 16:01:27 +02:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector
...
Energy Connectors
2020-10-12 15:49:50 +02:00
TheBusyBiscuit
2e83b726bc
[CI skip] Removed author tags from high-cohesion classes
2020-10-12 15:49:33 +02:00
TheBusyBiscuit
160c68b378
[CI skip] Refactoring and documentation
2020-10-12 15:04:27 +02:00
Sfiguz7
6cab415e37
Formatting, nerfed Basalt -> Lava
2020-10-12 14:10:16 +02:00
TheBusyBiscuit
612aad5d95
Fixes #2424
2020-10-12 12:11:28 +02:00
TheBusyBiscuit
3b7dd68164
Fixes #2450
2020-10-12 11:52:23 +02:00
TheBusyBiscuit
14e18d2962
Fixes #2455
2020-10-12 11:47:13 +02:00
Sfiguz7
fd58155a18
Added blackstone and basalt -> lava to crucibles
2020-10-12 09:10:52 +02:00
Senne Van Rompaey
4d474de290
Merge branch 'master' into MoreTalismans
2020-10-12 00:57:11 +02:00
svr333
b0b5c5a47f
Simplify to talisman.isItem()
2020-10-12 00:20:39 +02:00
svr333
125239f173
Refactor and rename methods
2020-10-12 00:19:19 +02:00
TheBusyBiscuit
f1dea4cab9
Merge pull request #2451 from CURVX/master
...
Fix #2433
2020-10-11 18:09:23 +02:00
CURVX
a9e64dbcfc
Resolves #2433
2020-10-11 19:58:17 +05:30
CURVX
064453346d
Resolves #2433
2020-10-11 19:49:34 +05:30
TheBusyBiscuit
c099f0bed4
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2020-10-11 15:41:47 +02:00
TheBusyBiscuit
df4a87d9fa
[Ci skip] A little bit of refactoring
2020-10-11 15:41:42 +02:00
LinoxGH
8eeb582ea3
Changed connector recipe.
2020-10-11 15:36:07 +03:00
TheBusyBiscuit
15884c65aa
Merge pull request #2435 from TheSilentPro/master fixes #2420 fixes #2422
...
Stop unwanted actions from StrangeNetherGoo and Heavy Cream
2020-10-11 13:46:40 +02:00
TheBusyBiscuit
b4b18f548f
[CI skip] Reduced technical debt
2020-10-11 12:48:51 +02:00
Silent
7177946aae
Changes pt2
2020-10-11 12:44:15 +02:00
TheBusyBiscuit
b80bc87ddc
Merge pull request #2440 from LinoxGH/ExplosivePickFix Fixed #2439
2020-10-11 12:27:27 +02:00
Silent
2902f74d10
Changes
2020-10-11 12:14:58 +02:00
LinoxGH
4980b078a1
Update BlockListener.java
2020-10-11 08:50:04 +03:00
LinoxGH
7af1e8144d
Update ExplosiveTool.java
2020-10-11 08:48:27 +03:00
TheBusyBiscuit
bc6ac0a4d1
[CI skip] Added Tape Measure Unit Tests
2020-10-11 01:27:38 +02:00
LinoxGH
957bcd9a3a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2020-10-11 02:01:54 +03:00
LinoxGH
d3c0a110a9
Changed capacitor recipe.
2020-10-11 00:31:06 +03:00
LinoxGH
ad505b6cef
Merge branch 'master' into EnergyConnector
2020-10-11 00:26:43 +03:00
LinoxGH
6082abb9b6
Merge branch 'master' into ExplosivePickFix
2020-10-11 00:23:59 +03:00
LinoxGH
bf3e6754cc
Changed event priorities.
2020-10-11 00:19:15 +03:00
LinoxGH
05d7ab5643
Update ExplosiveTool.java
2020-10-11 00:12:42 +03:00
Silent
dfe33b3534
Didn't know this existed
2020-10-10 22:05:50 +02:00
TheBusyBiscuit
bf25fc0b9d
[CI skip] Added Unit Tests for new Item Settings
2020-10-10 21:55:54 +02:00
TheBusyBiscuit
594d322df2
[CI skip] Added EnumSetting
2020-10-10 21:20:25 +02:00
TheBusyBiscuit
a44f2fa626
[CI skip] Some cleanup
2020-10-10 20:46:17 +02:00
Silent
f9928e5e10
Add requested changes
2020-10-10 20:20:08 +02:00
TheBusyBiscuit
2da7efd380
[CI skip] Updated a javadocs tag
2020-10-10 19:18:15 +02:00
TheBusyBiscuit
b60c2382a5
[CI skip] Quickly added DoubleRangeSetting copy
2020-10-10 18:52:22 +02:00
Silent
cf0f7c37e0
Merge remote-tracking branch 'upstream/master'
2020-10-10 18:50:49 +02:00
Silent
0580a873ec
Stop unwanted actions with StrangeNetherGoo and HeavyCream
2020-10-10 18:50:41 +02:00
TheBusyBiscuit
08bb3291c1
[CI skip] Updated translators list
2020-10-10 15:25:03 +02:00
LinoxGH
973f92c979
Update HeadTexture.java
...
I guess this is correct now.
2020-10-10 15:33:41 +03:00
TheBusyBiscuit
fd123b0bc2
[CI skip] Added another validation to head textures, looks at Linox
2020-10-10 14:22:14 +02:00
LinoxGH
49eca61a27
Changed HeadTexture.
2020-10-10 15:21:44 +03:00
LinoxGH
729facab61
Added Energy Connector texture.
2020-10-10 15:18:55 +03:00
TheBusyBiscuit
f895adde61
[CI skip] Reduced technical debt
2020-10-10 14:17:05 +02:00
TheBusyBiscuit
d63d6189a9
Merge branch 'master' into performance/cobblestone
2020-10-10 13:49:10 +02:00
TheBusyBiscuit
cf6add1149
Some small improvements before the merge
2020-10-10 13:36:07 +02:00
TheBusyBiscuit
72d3d24394
Two annotations!
2020-10-09 17:44:15 +02:00
TheBusyBiscuit
83e8010e29
Lots of refactoring
2020-10-09 17:39:21 +02:00
svr333
64684d86c3
Reduce to local scoop
2020-10-09 16:49:06 +02:00
TheBusyBiscuit
aab665ffea
Merge branch 'master' into tags
2020-10-09 11:46:47 +02:00
svr333
b042fbd3a4
Add check for ProtectionManagers
2020-10-08 22:34:18 +02:00
svr333
1cfc8aec90
Refactor (no build errors)
2020-10-08 22:15:30 +02:00
LinoxGH
b2833dc5c0
Update MagicalZombiePills.java
2020-10-08 21:42:57 +03:00
TheBusyBiscuit
8c80ad4040
Cleanup
2020-10-08 19:05:23 +02:00
TheBusyBiscuit
d891d182b5
Intentionally messed up imports
2020-10-08 18:53:19 +02:00
svr333
dc21ec5752
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
2020-10-08 18:23:15 +02:00
svr333
172dfc0610
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans
2020-10-08 18:22:23 +02:00
svr333
7c030c736f
Refactor (still build errors)
2020-10-08 18:21:00 +02:00
TheBusyBiscuit
ddd8ccec6b
Imports go brrrrrr
2020-10-08 18:12:34 +02:00
TheBusyBiscuit
43284f1534
Merge branch 'master' into performance/cobblestone
2020-10-08 16:19:03 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags
2020-10-08 16:16:11 +02:00
svr333
82716dd808
Fix resurrected_talisman lore
2020-10-08 15:30:25 +02:00
svr333
73cbbc3b54
Improve recipes of new Talismans
2020-10-08 15:29:46 +02:00
LinoxGH
09a40d036e
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2020-10-08 16:04:01 +03:00
LinoxGH
40caa2d574
Update ResearchSetup.java
2020-10-08 16:02:53 +03:00
LinoxGH
b5c917f719
Fixed the lore.
2020-10-08 16:00:26 +03:00
LinoxGH
4bf08db1d1
Merge branch 'master' into EnergyConnector
2020-10-08 15:53:08 +03:00
TheBusyBiscuit
26066f2e6c
Refactoring
2020-10-08 14:45:21 +02:00
TheBusyBiscuit
01d233af4d
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix
...
GPS Control Panel and GEO Scanner access checks
2020-10-08 14:37:16 +02:00
NCBPFluffyBear
90ccbb2261
Organized imports
2020-10-07 17:37:41 -05:00
svr333
b722dc2a00
Update lore
2020-10-08 00:20:35 +02:00
TheBusyBiscuit
08ed8b21c8
Merge branch 'bee-armor' into beeArmor
2020-10-07 22:14:39 +02:00
NCBPFluffyBear
b577c1e4a3
Did changes
2020-10-07 13:45:49 -05:00
TheBusyBiscuit
126ccf3d01
Formatting
2020-10-07 18:43:55 +02:00
TheBusyBiscuit
7c3fc99b3a
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
tags
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
2020-10-07 18:38:26 +02:00
TheBusyBiscuit
fc26f959b6
[CI skip] Small formatting correction
2020-10-07 18:30:21 +02:00
TheBusyBiscuit
e4ddc7c452
[CI skip] Enforce OTBS.
2020-10-07 18:27:01 +02:00
poma123
cd00848795
Merge branch 'master' into tags
2020-10-07 17:55:26 +02:00
TheBusyBiscuit
ed8f0e243b
Fixes #2405
2020-10-07 17:48:53 +02:00
TheBusyBiscuit
c3302d8cbd
Merge branch 'master' into tags
2020-10-07 17:44:27 +02:00
LinoxGH
eb572a1a77
Merge branch 'master' into EnergyConnector
2020-10-07 18:10:50 +03:00
svr333
a6a29509c7
Fix remaining issues
2020-10-07 17:02:42 +02:00
svr333
5e39920e59
Remove static's
2020-10-07 16:45:34 +02:00
TheBusyBiscuit
78515a3c61
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw
...
Add sticks recipe to table saw
2020-10-07 16:31:58 +02:00
TheBusyBiscuit
20a9c642fe
Some code cleanup
2020-10-07 16:24:14 +02:00
poma123
7814bdcdee
Merge branch 'master' into tags
2020-10-07 16:11:41 +02:00
Senne Van Rompaey
085ad2cd6b
Merge branch 'master' into MoreTalismans
2020-10-07 16:06:32 +02:00
svr333
a5998773e3
Fix build error
2020-10-07 16:04:02 +02:00
TheBusyBiscuit
80c4242dd7
Merge pull request #2384 from Seggan/master
...
Added Elytra Cap
2020-10-07 16:01:45 +02:00
svr333
3747ba4afa
Remove second consumeItem
2020-10-07 15:59:33 +02:00
svr333
a9b8f608ff
Attempt to make it work
2020-10-07 15:54:32 +02:00
Sfiguz7
91a7d9eacd
Why u do dis IntelliJ >:(
2020-10-07 13:37:32 +02:00
Sfiguz7
46dca73e04
Forgot to clean crucible changes off
2020-10-07 13:36:11 +02:00
Sfiguz7
f8be447821
Fixes #2403
2020-10-07 13:32:10 +02:00
Sfiguz7
51d0ac0417
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
2020-10-07 13:06:45 +02:00
svr333
85091516db
Add generic fail message
2020-10-07 12:12:02 +02:00
svr333
8ff3b31bf6
Create tryFind method
2020-10-07 12:03:45 +02:00
NCBPFluffyBear
37f0715156
Added permission checks for the GEO Scanner and GPS Control Panel
2020-10-06 19:46:22 -05:00
svr333
db7e39ff10
Fix requested changes
2020-10-07 00:06:32 +02:00
svr333
2eddaef88c
Fix comments
2020-10-07 00:00:22 +02:00
Seggan
1ccd4c14ac
More changes...
2020-10-06 15:41:14 -04:00
Seggan
960d53840a
Moved import
2020-10-06 15:39:15 -04:00
Seggan
20aa5d49dc
Merged ifs
2020-10-06 15:34:37 -04:00
Seggan
d1ede58f85
More requested changes...
2020-10-06 15:12:35 -04:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags
2020-10-06 21:07:49 +02:00
TheBusyBiscuit
d09a7e0f93
Fixes #2391
2020-10-06 21:05:39 +02:00
TheBusyBiscuit
07c84af3b5
Added NotConfigurable attribute
2020-10-06 21:01:18 +02:00
TheBusyBiscuit
f98d048b55
[CI skip] Reduced technical debt
2020-10-06 20:20:02 +02:00
svr333
fa394b4d44
Call planks.isPresent()
2020-10-06 19:50:57 +02:00
svr333
a9ce3c1f3e
Try to implement requested feature for RessurectedTalisman
2020-10-06 15:34:18 +02:00
svr333
e6ed632dd0
Refactor + undo placeholder item in displayrecipes
2020-10-06 11:53:51 +02:00
svr333
37242fe64a
Throw out variables
2020-10-06 01:26:23 +02:00
Seggan
db6295616e
Did more requested changes
2020-10-05 17:05:05 -04:00
Seggan
a4dc1428bc
Changed protection check (untested)
2020-10-05 17:02:09 -04:00
svr333
8c44c583cf
Add nullable tag
2020-10-05 23:01:30 +02:00
svr333
6e17cd2cc5
Extract to method
2020-10-05 23:00:44 +02:00
Seggan
4b3e31a8c7
Renamed listener
2020-10-05 16:56:25 -04:00
svr333
d5caaaa13e
Add base for ResurrectedTalisman
2020-10-05 22:46:53 +02:00
svr333
7eb680fa58
Remove redundant new line
2020-10-05 20:15:11 +02:00
svr333
997dce8970
Extract to method && remove redundant if statement
2020-10-05 20:07:56 +02:00
Senne Van Rompaey
94c5068cc2
Move version check
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2020-10-05 20:03:50 +02:00
svr333
038efb8391
Add myself @author
2020-10-05 20:00:31 +02:00
svr333
3ef0a67db6
Add @Nonnull
2020-10-05 19:59:55 +02:00