svr333
a8f53714b0
Switcheroo
2021-03-15 22:09:22 +01:00
TheBusyBiscuit
c2b3053574
[CI skip] Added warning message when registering Item Handlers twice.
2021-03-14 19:57:33 +01:00
TheBusyBiscuit
7ba3a0b7fa
[CI skip] Converted more blocks to the new BlockBreakHandler
2021-03-14 19:45:40 +01:00
StarWishsama
102e22c636
chore: resolve merge conflict
2021-03-14 21:40:14 +08:00
StarWishsama
322b55c9a4
Merge remote-tracking branch 'upstream/master' into enchant-level-limit
2021-03-14 21:34:51 +08:00
TheBusyBiscuit
aa349ccd0f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-03-14 14:29:30 +01:00
TheBusyBiscuit
f91bd21da1
Delete AutoEnchanter.java
2021-03-14 14:28:33 +01:00
TheBusyBiscuit
8c8577ad92
Delete AutoDisenchanter.java
2021-03-14 14:28:25 +01:00
TheBusyBiscuit
da01091e26
[CI skip] Removed deprecated methods from item settings
2021-03-14 13:36:25 +01:00
TheBusyBiscuit
6e4a1ccf5f
[CI skip] Removed temporary redirects
2021-03-14 13:34:17 +01:00
StarWishsama
ba96617b2d
chore: change text to adapt specify machine
2021-03-14 18:29:16 +08:00
StarWishsama
8762958f6d
refactor: finish review
2021-03-14 18:27:50 +08:00
TheBusyBiscuit
e39c2b661c
Fixes #2883
2021-03-14 11:02:47 +01:00
TheBusyBiscuit
fbd701bced
Fixed Mining Androids and improved itemsettings API
2021-03-13 21:56:54 +01:00
TheBusyBiscuit
0f54140f64
Renamed to ProcessHolder
2021-03-13 17:43:43 +01:00
TheBusyBiscuit
79a73d8e26
Some documentation and refactoring
2021-03-13 17:40:09 +01:00
TheBusyBiscuit
44a6d15d18
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
api/machine-operations
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
2021-03-13 17:36:55 +01:00
TheBusyBiscuit
3aa02d5e04
Added an option to disable block-gen optimizations for androids
2021-03-13 11:22:59 +01:00
TheBusyBiscuit
bc59731c38
Added a message when no chest was found
2021-03-13 11:03:57 +01:00
TheBusyBiscuit
a3ecde181e
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-03-13 10:59:57 +01:00
TheBusyBiscuit
42146d8608
[CI skip] Fixed javadocs
2021-03-13 00:46:50 +01:00
TheBusyBiscuit
4aec2ffbcf
Fixes #2878
2021-03-13 00:18:02 +01:00
TheBusyBiscuit
853f447337
Merge pull request #2859 from GallowsDove/master
...
Added ExplosiveToolBreakBlockEvent
2021-03-11 11:17:09 +01:00
Mooy1
048d4d6590
Update SlimefunStartupTask.java
2021-03-10 19:12:25 -06:00
Daniel Walsh
7a230d42c3
Merge pull request #2681 from Slimefun/features/multi-categories
2021-03-11 00:55:26 +00:00
Daniel Walsh
4b5ad219ec
Merge pull request #2328 from Slimefun/performance/cobblestone
...
This totally wasn't sitting fully approved for 16 days 👀
2021-03-11 00:52:41 +00:00
GallowsDove
305da7952d
did requested changes
2021-03-10 17:48:45 +01:00
TheBusyBiscuit
4678de1697
Fixes #2877 and added a new config option to crucibles
2021-03-10 14:04:33 +01:00
TheBusyBiscuit
86edb0df6a
Fixes #2876
2021-03-10 13:36:28 +01:00
TheBusyBiscuit
5b99391a33
Better logging for exceptions in cargo network code
2021-03-10 12:15:37 +01:00
TheBusyBiscuit
0fa862314f
Fixes #2856
2021-03-10 00:49:53 +01:00
TheBusyBiscuit
0be442bc07
Some refactoring
2021-03-10 00:44:20 +01:00
TheBusyBiscuit
bef0cfb413
Fixed #2861
2021-03-10 00:24:05 +01:00
TheBusyBiscuit
9cdab83db2
Merge branch 'master' into feature/auto-crafters
2021-03-09 17:00:21 +01:00
TheBusyBiscuit
0696991ab0
[CI skip] A lot of refactoring
2021-03-09 16:55:28 +01:00
TheBusyBiscuit
717e8c84a0
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
feature/auto-crafters
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
2021-03-09 16:44:54 +01:00
Mooy1
f7be9289d9
Update SlimefunPlugin.java
2021-03-06 01:00:56 -06:00
Mooy1
4dcf8aabea
fix addon inventories bug with non-default worlds
2021-03-06 00:55:12 -06:00
TheBusyBiscuit
d33dc965e0
Merge pull request #2827 from ProfElements/bookbinder-fixes
...
Fix multiple Book Binder issues.
2021-03-05 09:58:49 +01:00
GallowsDove
66db725ebc
forgot one thing, now it's ready.
2021-03-03 23:02:05 +01:00
GallowsDove
0518681887
Did requested changes
2021-03-03 19:56:14 +01:00
GallowsDove
3a7be26342
Added getExplosiveTool
2021-03-03 17:56:14 +01:00
GallowsDove
fe2492f006
Changed it into a single event instead of calling an event per block
2021-03-03 16:45:11 +01:00
GallowsDove
edf15fb40a
Added ExplosiveToolBreakBlockEvent triggered by an explosive tool breaking a block.
2021-03-03 16:23:14 +01:00
TheBusyBiscuit
8368194d94
[CI skip] Updated translators list
2021-03-03 14:21:19 +01:00
developer-pseudo
15fc388601
Translate categories_fi.yml via GitLocalize
2021-03-03 13:19:18 +00:00
Mooy1
c8fd79938b
did walshys annotations
2021-03-02 00:04:37 -06:00
TheBusyBiscuit
49950cf64c
Reduced technical debt
2021-03-01 14:07:20 +01:00
TheBusyBiscuit
15f4e838a8
Small improvements to logging
2021-03-01 13:55:57 +01:00
TheBusyBiscuit
8c1c67731b
Fixes #2852
2021-03-01 09:31:59 +01:00
TheBusyBiscuit
51b56b1e0b
Fixes #2851
2021-03-01 09:30:38 +01:00
Thehrz
9b8eff4977
Fixes #equalsItemMeta
2021-02-28 12:28:35 +08:00
ProfElements
9e01444b69
Make requested changes. Use Object.equals() instead of !=, make docs overall better
2021-02-27 18:23:35 -06:00
TheBusyBiscuit
84ad08be37
Fixes #2849
2021-02-27 10:19:19 +01:00
ProfElements
fb86415f31
Make requested changes. Fixed styling.
2021-02-26 15:07:47 -06:00
TheBusyBiscuit
c4be51f7bb
Fixes #2839
2021-02-24 15:57:21 +01:00
TheBusyBiscuit
979bb4b5f4
Updated textures and names
2021-02-23 11:14:07 +01:00
TheBusyBiscuit
659f329349
Merge branch 'master' into feature/auto-crafters
2021-02-23 11:11:26 +01:00
TheBusyBiscuit
6533b5023c
Merge pull request #2830 from StarWishsama/fix/wood-cutter-duplication
...
Fix duplicating woods when unable to replant
2021-02-23 11:05:45 +01:00
TheBusyBiscuit
338fe0f84b
Merge pull request #2597 from Slimefun/fixes/blocks fixes #2560
...
Refactoring + Fixes to Block Handlers
2021-02-22 18:34:19 +01:00
Thehrz
45c807c6bd
Fixes
2021-02-20 22:07:19 +08:00
Thehrz
bb0ef24188
Fixes #2677
2021-02-20 20:06:03 +08:00
Name1ess
c854cb7788
fix: duplicating woods when unable to replant
2021-02-20 12:34:56 +08:00
ProfElements
c3349f8b4c
Actually comment the file
2021-02-19 13:20:02 -06:00
ProfElements
0439a48a16
Make requested changes
2021-02-19 13:01:48 -06:00
CactusTheGuy
4096315e7d
Translate categories_vi.yml via GitLocalize
2021-02-19 07:30:35 +00:00
ProfElements
c643a52b4e
fix merge conflicts
2021-02-18 20:39:24 -06:00
ProfElements
92ed16473e
Fix #2805 , make sure the book binder doesnt kill overleveled enchantments
2021-02-18 20:26:41 -06:00
TheBusyBiscuit
c09773fcef
[CI skip] Manually sync czech translations
2021-02-13 13:10:45 +01:00
TheBusyBiscuit
c27eb2959a
[CI skip] Manually update dutch translations...
2021-02-12 20:09:19 +01:00
TheBusyBiscuit
ce643ad87f
Update Translators.java
2021-02-12 18:35:44 +01:00
peppower
40754d7da0
Translate categories_nl.yml via GitLocalize
2021-02-12 17:33:32 +00:00
Nikolay
eebaa069c9
Translate messages_bg.yml via GitLocalize
2021-02-12 16:08:55 +00:00
TheBusyBiscuit
2754703f9d
Merge branch 'master' into feature/auto-crafters
2021-02-10 18:34:34 +01:00
TheBusyBiscuit
854c3335e9
Fixes #2818
2021-02-10 18:33:34 +01:00
TheBusyBiscuit
e2f3944d66
Fixes #2817
2021-02-09 17:08:49 +01:00
TheBusyBiscuit
b224123918
Fixes #2804
2021-02-07 18:26:08 +01:00
TheBusyBiscuit
d3f4ca4779
Proper error-handling for addon inventories
2021-02-07 16:06:06 +01:00
TheBusyBiscuit
e47d0171cc
Fixes #2810
2021-02-07 12:30:55 +01:00
TheBusyBiscuit
9e83b4af00
Fixes #2809
2021-02-06 20:23:32 +01:00
TheBusyBiscuit
6e864ace99
Added researches and updated textures
2021-02-06 19:35:58 +01:00
TheBusyBiscuit
bbd631536d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-02-06 19:33:45 +01:00
TheBusyBiscuit
7ddd0469eb
Deprecated Automated Crafting Chamber (soon to be replaced)
2021-02-06 19:32:41 +01:00
TheBusyBiscuit
e6494da8c9
Allow any RecipeType (in theory)
2021-02-06 14:00:56 +01:00
TheBusyBiscuit
a5a16621ee
Merge branch 'master' into feature/auto-crafters
2021-02-06 11:19:07 +01:00
TheBusyBiscuit
47743b632e
Fixed an exception when disabled in an invalid environment.
2021-02-06 11:18:09 +01:00
TheBusyBiscuit
dec868284d
Updated dependencies
2021-02-06 11:11:58 +01:00
TheBusyBiscuit
baa4f92ea1
Added documentation
2021-02-06 11:09:13 +01:00
TheBusyBiscuit
eeb89c3c3b
Some very basic unit tests
2021-02-06 10:48:30 +01:00
TheBusyBiscuit
0adc1c3192
The Enhanced Auto Crafter now requires confirmation too
2021-02-06 01:55:54 +01:00
TheBusyBiscuit
e8a67cdd6a
Many more fixes
2021-02-06 01:54:08 +01:00
TheBusyBiscuit
340005109b
Even more fixes!
2021-02-06 01:14:23 +01:00
TheBusyBiscuit
1e9e8be82a
More bug fixes
2021-02-06 01:06:11 +01:00
TheBusyBiscuit
dd9a04fe04
Restored old classes and added deprecation warnings
2021-02-06 01:02:31 +01:00
TheBusyBiscuit
83aa84ca3b
Some bug fixes
2021-02-06 00:58:29 +01:00
TheBusyBiscuit
057fad1f08
Finished Auto-Crafters
2021-02-06 00:46:55 +01:00
TheBusyBiscuit
2d050a8e35
RecipeChoice task is now thread-safe
2021-02-06 00:29:57 +01:00
TheBusyBiscuit
a25b470272
Added sounds and two more messages
2021-02-06 00:14:44 +01:00
TheBusyBiscuit
3567dd87ba
Show recipe after selecting
2021-02-05 20:03:06 +01:00
TheBusyBiscuit
53ac633927
Split up recipe classes
2021-02-05 19:53:48 +01:00
TheBusyBiscuit
7d50d0eb32
Fixes #1161
2021-02-05 18:40:41 +01:00
TheBusyBiscuit
7ff6d755e8
Implemented basic behaviour
2021-02-05 17:26:03 +01:00
TheBusyBiscuit
6b4fe8a7a9
Added Enhanced Auto Crafter
2021-02-05 15:14:09 +01:00
TheBusyBiscuit
a7e890829d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters
2021-02-05 14:16:47 +01:00
TheBusyBiscuit
5edf61404b
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-02-05 14:15:17 +01:00
TheBusyBiscuit
155b2fc637
Some small visual changes
2021-02-05 14:12:17 +01:00
TheBusyBiscuit
80b49c264f
Update Translators.java
2021-02-04 20:12:47 +01:00
LirCZE
a2c3e24a95
Translate recipes_cs.yml via GitLocalize
2021-02-04 19:07:50 +00:00
100petr
e6a9511136
Translate recipes_cs.yml via GitLocalize
2021-02-04 19:07:49 +00:00
jakmanda05
bbce73ce76
Translate recipes_cs.yml via GitLocalize
2021-02-04 19:07:47 +00:00
100petr
c94add139b
Translate categories_cs.yml via GitLocalize
2021-02-04 19:07:45 +00:00
Jan Vrska
405b553f0b
Translate researches_cs.yml via GitLocalize
2021-02-04 19:07:44 +00:00
frfole
08942610af
Translate researches_cs.yml via GitLocalize
2021-02-04 19:07:43 +00:00
100petr
4c16273097
Translate researches_cs.yml via GitLocalize
2021-02-04 19:07:42 +00:00
Renzotom
4b4ef00ecb
Translate researches_cs.yml via GitLocalize
2021-02-04 19:07:41 +00:00
StarWishsama
b7fa8b621e
fix: color text doesn't work
2021-02-03 12:45:55 +08:00
StarWishsama
bc3b61ed90
optimize: no need display enchant item
2021-02-03 12:43:20 +08:00
StarWishsama
f0d427a19c
forget to return
2021-02-03 12:36:17 +08:00
StarWishsama
e5deee2bbd
optimize: add a switch for limit, set default value to 10
...
feat: utilize the progress bar to display (dis)enchant failed
2021-02-03 12:31:42 +08:00
TheBusyBiscuit
581199271c
Almost done with the vanilla auto crafter
2021-02-02 20:27:04 +01:00
TheBusyBiscuit
2c22983f0a
Added package descriptions
2021-02-02 19:38:01 +01:00
TheBusyBiscuit
0bf27fca15
Refactoring
2021-02-02 19:36:00 +01:00
TheBusyBiscuit
0aa5a999d4
Created abstract auto crafter framework
2021-02-02 18:57:45 +01:00
TheBusyBiscuit
5a0a52baab
Sweet deprecation warnings
2021-02-02 18:57:29 +01:00
Daniel Walsh
36639fd22c
Merge pull request #2791 from Slimefun/feature/componentify-versions-subcommand
2021-02-02 17:31:35 +00:00
Daniel Walsh
695ba7c742
Merge pull request #2643 from Slimefun/chore/has-unlocked
2021-02-02 17:30:45 +00:00
Daniel Walsh
b74eb5b30d
Merge pull request #2782 from Slimefun/feature/taisman-actionbar
...
Allow Talismans to use the Actionbar
2021-02-02 17:27:47 +00:00
Daniel Walsh
636d44cfb8
oops forgot 1 space
2021-02-02 12:25:43 +00:00
Daniel Walsh
498050dc81
Apply suggestions from code review
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-02-02 11:51:56 +00:00
TheBusyBiscuit
6d89d38c3a
Fixes #2793
2021-02-02 10:05:08 +01:00
TheBusyBiscuit
e99a39d2ab
Fixes #2794
2021-02-02 09:39:22 +01:00
StarWishsama
f308c60bd1
fix: Unable to limit enchantment level
...
optimize: set default and max level to Short.MAX_VALUE
2021-02-02 12:49:02 +08:00
Daniel Walsh
d41f276543
Lots more hover and click!
2021-02-01 17:14:21 +00:00
Daniel Walsh
e11929b587
Add java ver and hover to versions subcommand
2021-02-01 16:07:06 +00:00
TheBusyBiscuit
fe42f6fa9f
Nether Wart Blocks can be turned into Nether Warts using a Grind Stone
2021-02-01 10:47:31 +01:00
PaladinBear
6f8134a800
Translate researches_he.yml via GitLocalize
2021-01-31 07:52:59 +00:00
PaladinBear
dabc8bbbc0
Translate messages_he.yml via GitLocalize
2021-01-31 07:52:58 +00:00
TheBusyBiscuit
418b6ffa74
[CI skip] Merge pull request #2787 from Slimefun/gitlocalize-14895
2021-01-31 00:28:14 +01:00
TheBusyBiscuit
c78092bb85
[CI skip] Updated translators list
2021-01-31 00:27:14 +01:00
amarcais53
704e100e07
Translate messages_fr.yml via GitLocalize
2021-01-30 21:07:29 +00:00
Maxime
d6ae3ac81d
Translate messages_fr.yml via GitLocalize
2021-01-30 21:07:28 +00:00
Pierre
dbe127a1d1
Translate messages_fr.yml via GitLocalize
2021-01-30 21:07:27 +00:00
TheBusyBiscuit
b4d1894d8f
Merge pull request #2757 from StarWishsama/magician-talisman-fix
...
Fixes #2679
2021-01-29 16:34:53 +01:00
TheBusyBiscuit
a80269b7d9
[CI skip] Formatting
2021-01-29 12:19:40 +01:00
TheBusyBiscuit
f207601244
Translate messages_de.yml via GitLocalize
2021-01-29 10:51:06 +00:00
TheBusyBiscuit
d1b907dc02
Translate researches_de.yml via GitLocalize
2021-01-29 10:51:04 +00:00
HeroBrineKing
76d4c1362d
Translate messages_zh-TW.yml via GitLocalize
2021-01-29 08:43:23 +00:00
TheBusyBiscuit
9415a446f3
[CI skip] Merge pull request #2784 from Slimefun/gitlocalize-14892
...
Synced up zhCN translation
2021-01-29 09:23:59 +01:00
TheBusyBiscuit
24d0a87fe0
[CI skip] Updated translators list
2021-01-29 09:23:47 +01:00
Nameless
9e6c24a46a
Translate messages_zh-CN.yml via GitLocalize
2021-01-29 08:22:17 +00:00
Jiejue233
fed5925892
Translate researches_zh-CN.yml via GitLocalize
2021-01-29 08:22:15 +00:00
Just Mango
a7bf430183
Translate researches_vi.yml via GitLocalize
2021-01-29 08:20:43 +00:00
Just Mango
5ba1eaadff
Translate messages_vi.yml via GitLocalize
2021-01-29 08:20:41 +00:00
nahkd123
38d959d44c
Translate messages_vi.yml via GitLocalize
2021-01-29 08:20:40 +00:00
Name1ess
d5d7bc705a
Merge branch 'master' into magician-talisman-fix
2021-01-29 12:14:39 +08:00
StarWishsama
29b368f648
fix: shadow name
2021-01-29 12:13:24 +08:00
StarWishsama
8effed7139
Merge remote-tracking branch 'origin/magician-talisman-fix' into magician-talisman-fix
2021-01-29 12:10:02 +08:00
StarWishsama
a031585b5a
fix: thank you idea
2021-01-29 12:09:24 +08:00
TheBusyBiscuit
ee7786b8e4
Allow Talismans to use the Actionbar
2021-01-29 03:02:50 +01:00
TheBusyBiscuit
3c0afeb943
Small fix
2021-01-29 02:47:20 +01:00
TheBusyBiscuit
d75e693ceb
[CI skip] Merge pull request #2780 from Slimefun/gitlocalize-14890
...
Translated the new string
2021-01-28 23:16:28 +01:00
Nikolay
6505b1c624
Translate messages_bg.yml via GitLocalize
2021-01-28 21:28:58 +00:00
TheBusyBiscuit
06335f6e9a
Finished MachineProcessor API
2021-01-28 21:18:45 +01:00
TheBusyBiscuit
3f51440f11
First groundwork
2021-01-28 19:06:32 +01:00
bito-blosh
1c404d7f66
Translate messages_ja.yml via GitLocalize
2021-01-28 17:55:10 +00:00
TheBusyBiscuit
835e8fa384
Translate messages_ja.yml via GitLocalize
2021-01-28 17:55:09 +00:00
TheBusyBiscuit
46de5a700a
Little bit of refactoring
2021-01-28 18:43:20 +01:00
TheBusyBiscuit
8cf0f61f3e
Added placeholder for unloaded profiles to PlaceholderAPI integration
2021-01-28 18:21:22 +01:00
TheBusyBiscuit
20d6656f35
[CI skip] Merge pull request #2777 from Slimefun/gitlocalize-14884
...
add zh-TW wise talisman and enchantment book binding
2021-01-28 14:28:30 +01:00
HeroBrineKing
afb492fb3b
Translate researches_zh-TW.yml via GitLocalize
2021-01-28 13:09:52 +00:00
HeroBrineKing
8399136bc1
Translate messages_zh-TW.yml via GitLocalize
2021-01-28 13:08:40 +00:00
TheBusyBiscuit
1d111772f2
Translate messages_zh-TW.yml via GitLocalize
2021-01-28 13:08:39 +00:00
TheBusyBiscuit
cadf66a13c
Merge branch 'master' into fixes/blocks
2021-01-28 13:41:27 +01:00
TheBusyBiscuit
6df052e4cf
Fixes #2771
2021-01-28 12:37:13 +01:00
Daniel Walsh
23efc9b6f0
REEE Im not having a good day
2021-01-26 13:01:07 +00:00
Daniel Walsh
f923612388
oops
2021-01-26 12:58:14 +00:00
Daniel Walsh
03cce6265d
Make it return an immutable map
2021-01-26 12:55:03 +00:00
Daniel Walsh
5aa4361a92
Merge branch 'api/access-raw-storage' of github.com:Slimefun/Slimefun4 into api/access-raw-storage
2021-01-26 12:52:35 +00:00
TheBusyBiscuit
7ffc8aff24
Fixes #2760
2021-01-26 10:35:47 +01:00
TheBusyBiscuit
9436ce451a
Fixes #2460
2021-01-26 10:07:12 +01:00
TheBusyBiscuit
ff83bb025e
[CI skip] Merge pull request #2481 from MoKe12g/master
...
Explosive tools not working with silk touch
2021-01-26 10:02:25 +01:00
Daniel Walsh
986eb38e81
Whoops forgot to change this one
2021-01-26 07:47:41 +00:00
Daniel Walsh
d0e0aa3c65
getStorage -> getRawStorage
2021-01-26 07:44:04 +00:00
Daniel Walsh
fd40737682
Oops
2021-01-26 07:40:37 +00:00
Daniel Walsh
6c7b8fd9da
Add a way to retrieve the raw storage
2021-01-26 07:30:42 +00:00
bito-blosh
177c67d25c
Translate researches_ja.yml via GitLocalize
2021-01-26 04:15:47 +00:00
TheBusyBiscuit
c2da6c5f53
Changed recipe for Tier 3 electric ore grinder
2021-01-26 00:57:49 +01:00
TheBusyBiscuit
7d0168115f
Merge pull request #2599 from svr333/AddT3ElectricGrinder
...
Add Tier 3 Electric Ore Grinder
2021-01-26 00:56:19 +01:00
TheBusyBiscuit
2085d9eeba
[CI skip] Updated changelog
2021-01-26 00:56:03 +01:00
Daniel Walsh
91aaa546a6
Merge pull request #2680 from ProfElements/master
2021-01-25 15:44:06 +00:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761
...
Fixes #2761 probably
2021-01-25 16:36:49 +01:00
TheBusyBiscuit
30202d3f51
Merge pull request #2755 from kii-chan-reloaded/master
...
Check inv maxStackSize
2021-01-25 16:34:47 +01:00
TheBusyBiscuit
9f29901eb8
[CI skip] Updated translators list
2021-01-25 15:46:35 +01:00
Name1ess
f3fafabcff
Update TalismanListener.java
2021-01-25 20:10:35 +08:00
TheBusyBiscuit
5ac3b9ec53
[CI skip] Merge pull request #2766 from Slimefun/gitlocalize-14860
...
Updated Hungarian translations
2021-01-25 12:25:58 +01:00
TheBusyBiscuit
842308cce7
[CI skip] Merge pull request #2762 from Slimefun/gitlocalize-14855
...
Update Japanese translation files.
2021-01-25 12:25:13 +01:00
poma123
290afb4746
Translate researches_hu.yml via GitLocalize
2021-01-25 08:04:24 +00:00
KingDead
6792ee765f
Translate messages_hu.yml via GitLocalize
2021-01-25 08:04:22 +00:00
poma123
e47b89de4e
Translate messages_hu.yml via GitLocalize
2021-01-25 08:04:21 +00:00
StarWishsama
a6bcab266f
chore: remove register call when initialize
2021-01-25 12:18:24 +08:00
Name1ess
8d844254c2
fix: register recipes when speed is not 0
2021-01-25 12:15:18 +08:00
Nameless
76ebff105b
Translate researches_zh-CN.yml via GitLocalize
2021-01-25 04:06:01 +00:00
Nameless
89370d31f9
Translate messages_zh-CN.yml via GitLocalize
2021-01-25 04:05:59 +00:00
StarWishsama
decf9bd08c
fix: grammar issue
2021-01-25 11:59:53 +08:00
Nikolay
3b564c0486
Translate messages_bg.yml via GitLocalize
2021-01-24 22:55:41 +00:00
bito-blosh
826e90ef82
Translate messages_ja.yml via GitLocalize
2021-01-24 21:22:01 +00:00
TheBusyBiscuit
c9cdffdfac
Translate messages_ja.yml via GitLocalize
2021-01-24 21:22:00 +00:00
bito-blosh
ce869b2acc
Translate researches_ja.yml via GitLocalize
2021-01-24 21:21:58 +00:00
TheBusyBiscuit
abf948e4ed
Translate messages_de.yml via GitLocalize
2021-01-24 19:27:24 +00:00
TheBusyBiscuit
e5d5b2950d
Translate researches_de.yml via GitLocalize
2021-01-24 19:27:23 +00:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java
2021-01-24 20:23:30 +01:00
Luu7
794d184a41
Translate researches_es.yml via GitLocalize
2021-01-24 19:21:47 +00:00
Luu7
0da0468b23
Translate messages_es.yml via GitLocalize
2021-01-24 19:21:46 +00:00
dylan
cd643cabb5
Translate messages_es.yml via GitLocalize
2021-01-24 19:21:45 +00:00
TheBusyBiscuit
f958385f3d
Translate messages_es.yml via GitLocalize
2021-01-24 19:21:44 +00:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master
2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08
Cherry-picked Talisman of the Wise from #2645
2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa
Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git
2021-01-24 17:03:14 +01:00
StarWishsama
ffb063e2d8
refactor: removed unused import
2021-01-24 11:42:01 +08:00
StarWishsama
078a553283
refactor: replace Auto Enchanter setting to IntRange
2021-01-24 11:40:38 +08:00
StarWishsama
f89db91778
refactor: use for-loop for notice and replace to IntRangeSetting
2021-01-24 11:37:59 +08:00
StarWishsama
8302c0c932
fix: add missing judge in getRandomEnchantment
2021-01-24 11:01:42 +08:00
StarWishsama
9e49071161
feat: Add ItemSetting for magician talisman
...
This setting can set whether books can be enchanted.
2021-01-24 10:59:55 +08:00
TheBusyBiscuit
17fd2ec570
Added AsyncProfileLoadEvent
2021-01-23 19:38:59 +01:00
TheBusyBiscuit
f2a80fc04f
Merge pull request #2749 from Slimefun/patch/make-rechargeablehelper-public
...
Make RechargeableHelper public
2021-01-23 16:11:29 +01:00
TheBusyBiscuit
2ceef773c6
Finished fix for #2754
2021-01-23 15:32:37 +01:00
TheBusyBiscuit
389a2978c0
Fixes #2754
2021-01-23 14:25:10 +01:00
StarWishsama
48165dd138
fix: add enchant item check in filter
2021-01-23 18:49:42 +08:00
Name1ess
a94567333a
fix: add bypass for book
2021-01-23 18:45:31 +08:00
StarWishsama
018cfc33c8
feat: add display limit level
2021-01-23 17:07:30 +08:00
StarWishsama
5e279d7c40
fix: yaml format
2021-01-23 14:41:12 +08:00
StarWishsama
77231e86a5
fix: yaml format
2021-01-23 14:38:38 +08:00
StarWishsama
7d1df8ca24
feat: Add enchant limit to AutoDisenchanter and message
2021-01-23 14:36:50 +08:00
Name1ess
2777cec1d5
feat: Add enchant level limit to AutoEnchanter
2021-01-23 14:25:36 +08:00
TheBusyBiscuit
83c2c6a915
[CI skip] Refactoring
2021-01-22 22:00:27 +01:00
Keaton
76a0ea1fdc
Check inv maxStackSize
...
As mentioned in CS-CoreLib2's #141 and #142 PR's, previous iterations of Slimefun AContainers would not consider the underlying Inventory's max stack size when determining sizing or pushing items. This commit changes DirtyChestMenus to act similarly by storing a variable defined as the lower of the Inventory's max stack size and the ItemStack's max stack size in a slot.
2021-01-22 13:40:01 -06:00
TheBusyBiscuit
95170b6115
Update messages_he.yml
2021-01-22 13:16:40 +01:00
TheBusyBiscuit
feef32f44e
Update messages_he.yml
2021-01-22 13:15:43 +01:00
TheBusyBiscuit
2af5ce0b2d
Update messages_he.yml
2021-01-22 13:14:57 +01:00
TheBusyBiscuit
85ff6af02e
Fixed this mess of variables.
2021-01-22 13:13:33 +01:00
TheBusyBiscuit
663f5e2063
Update SupportedLanguage.java
2021-01-22 13:02:46 +01:00
TheBusyBiscuit
5a6081ec98
Update Translators.java
2021-01-22 13:02:24 +01:00
Molioron
5763553859
Translate messages_he.yml via GitLocalize
2021-01-22 12:00:58 +00:00
McAlmog
4fc735bb23
Translate messages_he.yml via GitLocalize
2021-01-22 12:00:56 +00:00
Omer Oreg
63009c0824
Translate messages_he.yml via GitLocalize
2021-01-22 12:00:54 +00:00
Timotiyadeyhakesem
ea32ae19c3
Translate messages_he.yml via GitLocalize
2021-01-22 12:00:52 +00:00
dhtdht020
22e07a716c
Translate messages_he.yml via GitLocalize
2021-01-22 12:00:51 +00:00
Eylonnn
4beda62944
Translate messages_he.yml via GitLocalize
2021-01-22 12:00:49 +00:00
TheBusyBiscuit
50149f6b99
[CI skip] Merge pull request #2752 from Slimefun/gitlocalize-14844
...
Update Chinese Translation
2021-01-22 12:59:02 +01:00
Nameless
c9591d34bb
Translate messages_zh-CN.yml via GitLocalize
2021-01-22 11:51:19 +00:00
TheBusyBiscuit
d00eff49b9
Translate messages_zh-CN.yml via GitLocalize
2021-01-22 11:51:18 +00:00
TheBusyBiscuit
f36532550b
[CI skip] Added a few more unit tests
2021-01-22 12:31:18 +01:00
TheBusyBiscuit
ab8e603ec6
Update ChargeUtils.java
2021-01-21 22:25:53 +01:00
Daniel Walsh
1bc0ae56f1
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/ChargeUtils.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-01-21 21:20:14 +00:00
Daniel Walsh
89c0988aca
Make sure capacity is greater than 0
2021-01-21 20:20:52 +00:00
Daniel Walsh
84ca63365c
RechargeableHelper -> ChargeUtils
2021-01-21 20:07:31 +00:00
Daniel Walsh
f65efd95fc
Requested changes
2021-01-21 20:05:27 +00:00
Daniel Walsh
499a464595
Add unit test
2021-01-21 19:53:19 +00:00
Daniel Walsh
549b075939
Make RechargeableHelper public
2021-01-21 19:25:38 +00:00
TheBusyBiscuit
d8aaf00635
Merge pull request #2715 from Slimefun/experimental/remove-cscorelib
...
Experimental: Slimefun but without CS-CoreLib
2021-01-21 15:58:38 +01:00
HeroBrineKing
2a0b921e1c
Translate messages_zh-TW.yml via GitLocalize
2021-01-21 05:06:03 +00:00
TheBusyBiscuit
f4c5fd4898
Translate messages_zh-TW.yml via GitLocalize
2021-01-21 05:06:02 +00:00
TheBusyBiscuit
1a2858c6a0
Fixed imports
2021-01-20 17:23:25 +01:00
TheBusyBiscuit
570c981de3
Merge branch 'master' into fixes/blocks
2021-01-20 17:19:18 +01:00
Just Mango
3966c352ee
Translate messages_vi.yml via GitLocalize
2021-01-20 14:11:46 +00:00
CactusTheGuy
40817f4b48
Translate messages_vi.yml via GitLocalize
2021-01-20 14:11:45 +00:00
nahkd123
de57194440
Translate messages_vi.yml via GitLocalize
2021-01-20 14:11:44 +00:00
TheBusyBiscuit
35b2c4a1e4
Updated translators list
2021-01-20 14:55:03 +01:00
Molioron
4832637501
Translate researches_he.yml via GitLocalize
2021-01-20 13:51:32 +00:00
Timotiyadeyhakesem
33d265a779
Translate researches_he.yml via GitLocalize
2021-01-20 13:51:30 +00:00
Eylonnn
480f5d949d
Translate researches_he.yml via GitLocalize
2021-01-20 13:51:29 +00:00
Omer Oreg
af630a6e4c
Translate researches_he.yml via GitLocalize
2021-01-20 13:51:27 +00:00
TheBusyBiscuit
f0b0e77fd5
[CI skip] Merge pull request #2743 from Slimefun/gitlocalize-14837
...
Translated the new string
2021-01-20 14:20:25 +01:00
Nikolay
b13daf886b
Translate messages_bg.yml via GitLocalize
2021-01-20 13:12:31 +00:00
bito-blosh
50e1e02118
Translate messages_ja.yml via GitLocalize
2021-01-20 13:07:47 +00:00
TheBusyBiscuit
b47fbf60ff
Translate messages_ja.yml via GitLocalize
2021-01-20 13:07:45 +00:00
Daniel Walsh
346fc7bc44
Merge pull request #2733 from Seggan/master
2021-01-20 12:35:07 +00:00
TheBusyBiscuit
fcafc125c7
[CI skip] Merge pull request #2740 from Slimefun/gitlocalize-14829
...
messages_es
2021-01-20 10:55:24 +01:00
TheBusyBiscuit
5c3f815a77
[CI skip] Merge pull request #2739 from Slimefun/gitlocalize-14828
...
researches_es
2021-01-20 10:53:22 +01:00
Luu7
15e95846a5
Translate recipes_es.yml via GitLocalize
2021-01-19 19:02:37 +00:00
KhronoZ
89c030340c
Translate messages_es.yml via GitLocalize
2021-01-19 18:52:47 +00:00
Luu7
c410d7ea4e
Translate messages_es.yml via GitLocalize
2021-01-19 18:52:46 +00:00
Luu7
842cc9b791
Translate researches_es.yml via GitLocalize
2021-01-19 18:52:27 +00:00
TheBusyBiscuit
591421fc32
[CI skip] Fixed javadocs
2021-01-19 10:01:55 +01:00
TheBusyBiscuit
9840a550ce
[CI skip] Changed internal profiler flag to a volatile boolean
2021-01-19 10:01:28 +01:00
TheBusyBiscuit
4075c51975
[CI skip] Refactoring and improved logging
2021-01-18 23:29:44 +01:00
svr333
ffef8350b1
Merge branch 'master' into performance/cobblestone
2021-01-18 22:18:02 +01:00
Seggan
3fac23e26b
Fine
2021-01-18 16:03:19 -05:00
Seggan
31a1d7b3b2
Localization + removed redundant 1st check
2021-01-18 09:41:38 -05:00
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
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
poma123
99946174de
Translate researches_hu.yml via GitLocalize
2020-10-25 14:40:55 +00:00
András Marczinkó
18f384e9cc
Translate messages_hu.yml via GitLocalize
2020-10-25 14:40:53 +00: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
TheBusyBiscuit
38bf228012
Merge pull request #2490 from Mooy1/patch-1
...
fix empty slot in contributors
2020-10-20 17:43:09 +02:00
Mooy1
536c5af857
Update ContributorsMenu.java
2020-10-20 10:34:35 -05:00
TheBusyBiscuit
094d4a6ae0
Fixes #2493
2020-10-20 16:45:31 +02: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
0a4f666094
me dumb
2020-10-18 16:06:19 +02:00
Panda.com
b4cd8e0d0c
added Unit Test
2020-10-18 16:01:32 +02:00
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
56a1ee5336
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2020-10-18 13:17:29 +02:00
TheBusyBiscuit
e054fe6682
Fixes #2448
2020-10-18 13:17:18 +02:00
Nameless
de1e846382
Translate researches_zh-CN.yml via GitLocalize
2020-10-18 02:44:36 +00:00
Nameless
f9d4be9cbb
Translate messages_zh-CN.yml via GitLocalize
2020-10-18 02:44:33 +00:00
TheBusyBiscuit
c4bf0ecdd2
First step towards a task
2020-10-18 01:44:32 +02:00
Panda.com
e5d341485f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/#2470
...
# Conflicts:
# src/main/resources/tags/block_placer_ignored_materials.json
2020-10-17 13:37:41 +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
Timotiyadeyhakesem
ca6962811f
Translate categories_he.yml via GitLocalize
2020-10-16 21:57:07 +00:00
uiytt
0a18c30890
Removed now useless method : research
2020-10-15 17:38:59 +02:00
Panda.com
49c7d3ad23
14* prs
2020-10-15 15:49:00 +02:00
Panda.com
c00ded786a
fix?
2020-10-15 15:46:01 +02:00
Panda.com
372c6b41b1
a
2020-10-15 15:45:23 +02:00
Panda.com
349c57aef4
a
2020-10-15 15:44:32 +02:00
Panda.com
7dbbb87af5
?
2020-10-15 15:43:28 +02:00
Panda.com
6611eaf444
idk whats wrong with "values"
2020-10-15 15:43:06 +02:00
Panda.com
29541cdfe2
Someone else can go format this if its not good
2020-10-15 15:41:21 +02:00
Panda.com
16bf13b2af
stop bullying
2020-10-15 15:12:03 +02:00
Panda.com
3b43dd7ebc
good now?
2020-10-15 15:08:42 +02:00
Panda.com
ee3e358f31
:pansad:
2020-10-15 15:07:50 +02:00
Panda.com
27583fc3f0
1 eternity later
2020-10-15 15:05:06 +02:00
Panda.com
0b27ea6ed5
?
2020-10-15 15:03:02 +02:00
Panda.com
b70949a386
fixed fingerscrossed
2020-10-15 14:59:44 +02:00
Panda.com
78dcaa4328
fixes #2470
2020-10-15 14:42:44 +02:00
TheBusyBiscuit
ceab97361f
[CI skip] Merge pull request #2476 from Slimefun/gitlocalize-13833
...
added new translations
2020-10-15 14:22:47 +02:00
TheBusyBiscuit
954b0075e6
[CI skip] Added package-info.json
2020-10-15 14:15:37 +02:00
Pierre
36ccb4e5eb
Translate messages_fr.yml via GitLocalize
2020-10-15 11:51:12 +00:00
TheBusyBiscuit
e18c7cb245
Fixed a dupe bug with mcMMO
2020-10-15 13:50:12 +02:00
TheBusyBiscuit
a5ee1cda5a
Translate messages_ja.yml via GitLocalize
2020-10-14 22:42:51 +00:00
Scott Gomez Andoy
c2ade61beb
Translate researches_tl.yml via GitLocalize
2020-10-14 17:18:24 +00:00
Scott Gomez Andoy
20b8dbf09d
Translate messages_tl.yml via GitLocalize
2020-10-14 17:18:23 +00: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
50e926d18a
Fixes #2457
2020-10-14 00:34:04 +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
692fa38246
[CI skip] Merge pull request #2461 from Slimefun/gitlocalize-13398
...
Updated Russian localizations
2020-10-13 23:26:48 +02:00
TheBusyBiscuit
4a53e82414
[CI skip] Merge pull request #2463 from Slimefun/gitlocalize-13432
...
Update Japanese translation file.
2020-10-13 23:25:07 +02:00
TheBusyBiscuit
91cc7ffc99
[CI skip] Merge pull request #2466 from Slimefun/gitlocalize-13824
...
Updated Turkish Translations
2020-10-13 23:24:01 +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
LinoxGH
4b39d6d58b
Translate researches_tr.yml via GitLocalize
2020-10-13 13:53:26 +00:00
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
bito-blosh
97e0c660b2
Translate researches_ja.yml via GitLocalize
2020-10-12 18:40:38 +00: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
TheBusyBiscuit
e2101c4ac9
Translate messages_ru.yml via GitLocalize
2020-10-12 14:26:50 +00:00
SoSeDiK
86d94a3122
Translate researches_ru.yml via GitLocalize
2020-10-12 14:26:49 +00: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
86b46939d1
[CI skip] Merge pull request #2442 from Slimefun/gitlocalize-13359
...
new translations
2020-10-11 01:36:41 +02:00
TheBusyBiscuit
2c9dcbb5dc
[CI skip] Merge pull request #2441 from Slimefun/gitlocalize-13358
...
new translations
2020-10-11 01:36:28 +02:00
TheBusyBiscuit
bc6ac0a4d1
[CI skip] Added Tape Measure Unit Tests
2020-10-11 01:27:38 +02:00
Pierre
b7da3d816d
Translate messages_fr.yml via GitLocalize
2020-10-10 23:22:55 +00:00
Pierre
1fb8a2f66c
Translate researches_fr.yml via GitLocalize
2020-10-10 23:22:38 +00: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
fa1cecef2f
[CI skip] Merge pull request #2436 from Slimefun/gitlocalize-13355
...
Updated bulgarian translations
2020-10-10 19:44:00 +02:00
TheBusyBiscuit
6434c79a0a
Translate messages_de.yml via GitLocalize
2020-10-10 17:33:22 +00:00
TheBusyBiscuit
1088aea40e
Translate researches_de.yml via GitLocalize
2020-10-10 17:33:20 +00:00
DNBGlol
01fc7cd536
Translate categories_bg.yml via GitLocalize
2020-10-10 17:28:03 +00:00
DNBGlol
c2ca5a1ea5
Translate resources_bg.yml via GitLocalize
2020-10-10 17:28:02 +00: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
44e6449f9e
Merge pull request #2430 from Slimefun/gitlocalize-13351
...
Update messages_nl.yml
2020-10-10 15:27:19 +02:00
TheBusyBiscuit
c9ca11c62c
[CI skip] Merge pull request #2431 from Slimefun/gitlocalize-13352
...
Update recipes_nl.yml
2020-10-10 15:26:19 +02:00
TheBusyBiscuit
ea1d1756ae
[CI skip] Merge pull request #2432 from Slimefun/gitlocalize-13353
...
Update categories translation for Dutch
2020-10-10 15:25:32 +02:00
TheBusyBiscuit
08bb3291c1
[CI skip] Updated translators list
2020-10-10 15:25:03 +02:00
Senne Van Rompaey
47d39cdc3c
Translate categories_nl.yml via GitLocalize
2020-10-10 13:12:28 +00:00
milvantiou
025021f5b5
Translate categories_nl.yml via GitLocalize
2020-10-10 13:12:27 +00:00
Sven313D
af608e3c13
Translate recipes_nl.yml via GitLocalize
2020-10-10 12:42:09 +00:00
LinoxGH
973f92c979
Update HeadTexture.java
...
I guess this is correct now.
2020-10-10 15:33:41 +03:00
Senne Van Rompaey
e80b3b64d2
Translate messages_nl.yml via GitLocalize
2020-10-10 12:27:12 +00: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
4c47a9cb93
Merge pull request #2298 from Slimefun/tags
...
Implemented Tags
2020-10-10 13:38:48 +02:00
TheBusyBiscuit
cf6add1149
Some small improvements before the merge
2020-10-10 13:36:07 +02:00
TheBusyBiscuit
c03b54c2c3
[CI skip] Merge pull request #2417 from Slimefun/gitlocalize-13345
...
Updated Hungarian translations
2020-10-10 01:25:10 +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
LinoxGH
26d46c2dc9
Translate researches_tr.yml via GitLocalize
2020-10-09 14:48:14 +00:00
LinoxGH
7e3866a25b
Translate messages_tr.yml via GitLocalize
2020-10-09 14:48:12 +00:00
poma123
72f7441a18
Small fixes
2020-10-09 16:36:25 +02:00
poma123
b7b7fa8a34
Translate researches_hu.yml via GitLocalize
2020-10-09 14:30:47 +00:00
poma123
076f1b51a4
Translate resources_hu.yml via GitLocalize
2020-10-09 14:30:45 +00:00
poma123
5ac0792cb0
Translate recipes_hu.yml via GitLocalize
2020-10-09 14:30:43 +00:00
poma123
f3fafaff26
Translate categories_hu.yml via GitLocalize
2020-10-09 14:30:42 +00:00
poma123
bd0f15bc95
Translate messages_hu.yml via GitLocalize
2020-10-09 14:30:38 +00:00
bito-blosh
3e20911c48
Translate researches_ja.yml via GitLocalize
2020-10-09 12:13:19 +00:00
TheBusyBiscuit
c440fd0778
Translate messages_ja.yml via GitLocalize
2020-10-09 12:13:17 +00: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