TheBusyBiscuit
8b28f3685a
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into chore/has-unlocked
2021-01-17 14:33:46 +01:00
TheBusyBiscuit
7eff4d381e
Fixed a small issue with backpacks
2021-01-17 14:27:01 +01:00
TheBusyBiscuit
9c3c6d7245
[CI skip] Fixed javadocs
2021-01-17 14:04:51 +01:00
TheBusyBiscuit
eab6164690
Fixed
2021-01-17 12:19:08 +01:00
TheBusyBiscuit
7ca8392616
Improved documentation
2021-01-17 01:48:26 +01:00
TheBusyBiscuit
79c7c4826f
Refactoring and documentation
2021-01-17 01:01:42 +01:00
Seggan
e1810f60ff
Oops
2021-01-16 12:01:27 -05:00
Seggan
2e7291c3a5
Script validation
2021-01-16 11:38:19 -05:00
svr333
f8b135592d
Merge branch 'master' into chore/has-unlocked
2021-01-16 16:04:21 +01:00
TheBusyBiscuit
16ed670573
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
refactoring/holograms
Conflicts:
CHANGELOG.md
2021-01-16 15:56:23 +01:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items
...
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
2021-01-16 15:51:17 +01:00
TheBusyBiscuit
7758fabcec
Merge pull request #2732 from Slimefun/gitlocalize-14785
...
Translated to Bulgarian
2021-01-16 15:50:38 +01:00
TheBusyBiscuit
03b4c10bad
[CI skip] Updated changelog
2021-01-16 14:46:00 +01:00
Nikolay
defad8af32
Translate messages_bg.yml via GitLocalize
2021-01-16 13:13:35 +00:00
DNBGlol
61a30ec8b3
Translate messages_bg.yml via GitLocalize
2021-01-16 13:13:33 +00:00
Daniel Walsh
485fc1aa69
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-01-16 10:39:05 +00:00
Daniel Walsh
ff368bdf56
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-01-16 10:35:03 +00:00
TheBusyBiscuit
1b527f4a61
Merge branch 'master' into chore/has-unlocked
2021-01-16 11:34:57 +01:00
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
5cd1d8cb22
appease yaml lint v3
2021-01-14 15:05:08 -06:00
ProfElements
782da8582f
fix researches_en.yml formatting
2021-01-14 14:56:13 -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
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
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
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
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
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
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
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
8e2d250b1c
[CI skip] Merge pull request #2691 from Slimefun/gitlocalize-14618
...
Updated Hungarian translations
2021-01-07 13:56:28 +01:00
TheBusyBiscuit
f9cfe03a9f
[CI skip] Updated translators list
2021-01-07 13:56:10 +01:00
poma123
d15d8009cb
Translate resources_hu.yml via GitLocalize
2021-01-07 11:43:26 +00:00
poma123
c4cc0496ea
Translate messages_hu.yml via GitLocalize
2021-01-07 11:43:22 +00:00
KingDeadZ
a6c8f3b437
Translate messages_hu.yml via GitLocalize
2021-01-07 11:43:21 +00:00
TheBusyBiscuit
e66af680c2
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-01-07 11:20:12 +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
0a5ca8d9f6
Update messages_vi.yml
2021-01-06 21:33:51 +01:00
CactusTheGuy
8c7f28f11b
Translate researches_vi.yml via GitLocalize
2021-01-06 20:30:21 +00:00
Vương Vinh
3cded3d28b
Translate researches_vi.yml via GitLocalize
2021-01-06 20:30:20 +00:00
nahkd123
3c41b341d1
Translate researches_vi.yml via GitLocalize
2021-01-06 20:30:19 +00:00
Just Mango
c0a06e4862
Translate researches_vi.yml via GitLocalize
2021-01-06 20:30:18 +00:00
TheBusyBiscuit
2734cc9f25
Translate messages_vi.yml via GitLocalize
2021-01-06 20:30:17 +00:00
Just Mango
1ae2adaf2e
Translate messages_vi.yml via GitLocalize
2021-01-06 20:30:15 +00:00
CactusTheGuy
7cda34d47a
Translate messages_vi.yml via GitLocalize
2021-01-06 20:30:14 +00:00
nahkd123
a64cdec153
Translate messages_vi.yml via GitLocalize
2021-01-06 20:30:13 +00: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
22f308884c
[CI skip] Merge pull request #2689 from Slimefun/gitlocalize-14616
...
Updated portuguese (brazil) translations
2021-01-06 20:58:32 +01:00
TheBusyBiscuit
5fae6f1c37
[CI skip] Updated translators list
2021-01-06 20:57:58 +01:00
Gustavo de Souza
47d5d356d3
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:19 +00:00
DayOS
389dc388ed
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:18 +00:00
Marcio
c613d1220f
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:16 +00:00
Sxigames
58113d9aff
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:15 +00:00
FaolanMalcadh
1fa59c7d31
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:14 +00:00
TheBusyBiscuit
a2be3d1255
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:13 +00:00
krazybeat
a65a61a557
Translate messages_pt-BR.yml via GitLocalize
2021-01-06 19:56:12 +00:00
Gustavo de Souza
cee50cd615
Translate resources_pt.yml via GitLocalize
2021-01-06 19:48:33 +00: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
b6f257bff1
Fixed whitespaces in yaml
2021-01-06 17:54:58 +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
ef0d557b62
[CI skip] Merge pull request #2678 from Slimefun/gitlocalize-14569
...
Updated bulgarian translations
2021-01-02 20:43:50 +01:00
TheBusyBiscuit
c637b2fd0c
[CI skip] Updated translators list
2021-01-02 20:43:29 +01:00
Nikolay
3acdcec70f
Translate categories_bg.yml via GitLocalize
2021-01-02 19:42:31 +00:00
Nikolay
e89363e8bb
Translate recipes_bg.yml via GitLocalize
2021-01-02 19:42:30 +00:00
TheBusyBiscuit
60acccfb28
[CI skip] Merge pull request #2671 from Slimefun/gitlocalize-14557
...
update translation
2021-01-02 20:37:25 +01:00
TheBusyBiscuit
1d95455429
[CI skip] Merge pull request #2672 from Slimefun/gitlocalize-14558
...
update translation
2021-01-02 20:37:09 +01:00
TheBusyBiscuit
df2dce0c95
[CI skip] Updated translators list
2021-01-02 20:35:54 +01:00
Aeris One
863306d2df
Translate messages_fr.yml via GitLocalize
2021-01-01 16:07:21 +00:00
Pierre
270382d7ec
Translate messages_fr.yml via GitLocalize
2021-01-01 16:07:19 +00:00
Aeris One
b23972c7dd
Translate researches_fr.yml via GitLocalize
2021-01-01 16:06:53 +00:00
TheRetix
b41a4df823
Translate researches_fr.yml via GitLocalize
2021-01-01 16:06:52 +00: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
Daniel Walsh
2c4c7579ae
Merge pull request #2637 from AnotherMC/master
...
Temporary fix for #2636
2020-12-20 22:20:03 +00:00
Patbox
d7a8903211
Temponary fix for #2636
2020-12-19 16:30:38 +01:00
Nameless
6be86e99be
Translate researches_zh-CN.yml via GitLocalize
2020-12-19 14:28:02 +00:00
Nameless
7659ae892f
Translate messages_zh-CN.yml via GitLocalize
2020-12-19 14:27:59 +00: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
d70e79ccfa
[CI skip] Merge pull request #2623 from Slimefun/gitlocalize-14291
...
messges_es
2020-12-17 13:36:21 +01:00
TheBusyBiscuit
41dfc92358
[CI skip] Merge pull request #2624 from Slimefun/gitlocalize-14292
...
researches_es
2020-12-17 13:33:55 +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
DaHolyCheese
b99f04eab4
Translate researches_es.yml via GitLocalize
2020-12-12 14:51:08 +00:00
Luu7
67112e29ac
Translate messages_es.yml via GitLocalize
2020-12-12 14:50:26 +00:00
TheBusyBiscuit
86e677cd93
Translate messages_de.yml via GitLocalize
2020-12-12 13:23:55 +00:00
TheBusyBiscuit
e56ba77002
Translate researches_de.yml via GitLocalize
2020-12-12 13:23:54 +00:00
TheBusyBiscuit
a95652f718
[CI skip] Merge pull request #2620 from Slimefun/gitlocalize-14285
...
add zh-TW version of bee armor research
2020-12-12 14:05:04 +01:00
TheBusyBiscuit
f32be5649a
[CI skip] Merge pull request #2619 from Slimefun/gitlocalize-14284
...
add zh-TW version of bee armor message
2020-12-12 14:04:29 +01:00
TheBusyBiscuit
f84faab48d
[CI skip] Merge pull request #2615 from Slimefun/gitlocalize-14281
...
Updated Russian localizations
2020-12-12 14:03:49 +01:00
TheBusyBiscuit
88b6e6d9af
[CI skip] Merge pull request #2617 from Slimefun/gitlocalize-14283
...
Updated Hungarian translations
2020-12-12 14:02:53 +01:00
TheBusyBiscuit
d2e1ac9b6e
[CI skip] Merge pull request #2621 from Slimefun/gitlocalize-14287
...
Update Japanese translation file.
2020-12-12 14:02:06 +01:00
TheBusyBiscuit
3d54080001
[CI skip] A bit o refactoring
2020-12-12 14:00:11 +01:00
bito-blosh
3825fa5d4b
Translate researches_ja.yml via GitLocalize
2020-12-11 20:09:09 +00:00
TheBusyBiscuit
def67399c4
Translate messages_ja.yml via GitLocalize
2020-12-11 20:09:06 +00:00
HeroBrineKing
4e510aefc8
Translate researches_zh-TW.yml via GitLocalize
2020-12-11 13:07:36 +00:00
TheBusyBiscuit
4fd973b3b1
Translate messages_zh-TW.yml via GitLocalize
2020-12-11 13:07:09 +00:00
poma123
b43277c0f4
Translate researches_hu.yml via GitLocalize
2020-12-11 12:36:35 +00:00
TheBusyBiscuit
f36743cfe3
Translate messages_hu.yml via GitLocalize
2020-12-11 12:36:33 +00:00
SoSeDiK
fc97648abb
Translate researches_ru.yml via GitLocalize
2020-12-11 12:11:41 +00:00
SoSeDiK
8d7e15df81
Translate messages_ru.yml via GitLocalize
2020-12-11 12:11:38 +00: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
TheBusyBiscuit
5aa5ca1aed
Merge pull request #2595 from AnotherMC/master
...
Fix ghost blocks
2020-12-10 21:51:00 +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
Just Mango
555aa050a1
Translate categories_vi.yml via GitLocalize
2020-12-07 11:16:58 +00: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
Nameless
3a5bfd75cb
Translate researches_zh-CN.yml via GitLocalize
2020-11-28 10:37:27 +00: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
876fbda585
[CI skip] Merge pull request #2564 from Slimefun/gitlocalize-14181
...
Update pt-BR translations
2020-11-23 16:35:47 +01:00
TheBusyBiscuit
1ec4e67df4
[CI skip] Merge pull request #2565 from Slimefun/gitlocalize-14182
...
Updated pt translations
2020-11-23 16:35:21 +01:00
TheBusyBiscuit
4a6418cd7d
[CI skip] Updated translators list
2020-11-23 16:34:47 +01:00
Gustavo de Souza
bf06e2be83
Translate categories_pt.yml via GitLocalize
2020-11-23 12:36:03 +00:00
Mauricio Roberto
ac1788a98c
Translate researches_pt-BR.yml via GitLocalize
2020-11-23 12:35:09 +00: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
1d36ca82ba
Merge pull request #2522 from Slimefun/code-quality/abstract-classes
...
Code quality: Getting rid of abstract energy classes
2020-11-10 00:11:50 +01:00
TheBusyBiscuit
dee7ded9cd
Merge pull request #2537 from Slimefun/gitlocalize-14021
...
fix of messenge_zh-TW
2020-11-08 23:40:14 +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
Wei-Liang Liou
b9f1e6d688
Translate messages_zh-TW.yml via GitLocalize
2020-11-04 10:08:41 +00:00
TheBusyBiscuit
b80d8cfeda
[CI skip] Updated translators
2020-11-03 18:28:08 +01:00
Wei-Liang Liou
b076d9ee64
Translate categories_zh-TW.yml via GitLocalize
2020-11-03 15:33:31 +00: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
1141a01fd0
Fixes #2519
2020-11-01 20:46:29 +01:00
TheBusyBiscuit
6ced4d166e
Fixes #2527
2020-11-01 20:12:34 +01:00
HeroBrineKing
519140ede6
Translate resources_zh-TW.yml via GitLocalize
2020-10-31 11:50:41 +00:00
HeroBrineKing
36460ed11f
Translate researches_zh-TW.yml via GitLocalize
2020-10-31 11:50:40 +00:00
HeroBrineKing
7ecdbbc97d
Translate recipes_zh-TW.yml via GitLocalize
2020-10-31 11:50:39 +00:00
TheBusyBiscuit
935a36cfbd
Translate messages_zh-TW.yml via GitLocalize
2020-10-31 11:50:36 +00:00
HeroBrineKing
5fafac0f84
Translate categories_zh-TW.yml via GitLocalize
2020-10-31 11:50:35 +00:00
TheBusyBiscuit
3bf7dfc1c3
Update recipes_ko.yml
2020-10-31 10:17:59 +01:00
20181241
aa29c33625
Translate recipes_ko.yml via GitLocalize
2020-10-31 09:15:24 +00: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