Martin Brom
|
4a6cfd9a85
|
Revert changes to FireworksOption
Change item in LearningAnimationOption to a map when enabled
|
2021-05-11 22:22:17 +02:00 |
|
Martin Brom
|
5817bf16fd
|
Change annotations to Nonnull
|
2021-05-11 22:01:29 +02:00 |
|
Martin Brom
|
d1aac2e291
|
Add enchantment to FireworksOption and LearningAnimationOption when enabled
Add minecraft alias
|
2021-05-11 21:54:33 +02:00 |
|
TheBusyBiscuit
|
9c05237af3
|
Merge pull request #3037 from StarWishsama/chore/auto-enchant-event
Introduced AsyncAutoEnchanterProcessEvent
|
2021-05-11 14:13:37 +02:00 |
|
Daniel Walsh
|
f01162cca1
|
Apply suggestions from code review
|
2021-05-11 13:10:11 +01:00 |
|
StarWishsama
|
ea96b9ed3c
|
chore: resolve suggestions
|
2021-05-11 12:26:19 +08:00 |
|
NatsuHana
|
ad86c88a94
|
chore: renane the event to adapt bukkit namestyle
|
2021-05-11 09:35:44 +08:00 |
|
TheBusyBiscuit
|
5620528c1d
|
[CI skip] Updated changelog and workflows
|
2021-05-10 23:18:36 +02:00 |
|
Daniel Walsh
|
a64597e129
|
Merge pull request #3038 from Mooy1/fix/explosive-pick-handler
|
2021-05-10 21:20:02 +01:00 |
|
a
|
41d0a93275
|
Update ExplosiveTool.java
|
2021-05-10 13:59:32 -05:00 |
|
TheBusyBiscuit
|
bcdda9ab03
|
Fixes #3041
|
2021-05-10 18:54:13 +02:00 |
|
TheBusyBiscuit
|
8a8b8ce577
|
Merge pull request #3015 from Slimefun/performance/networks
Improved memory usage of cargo/energy networks and fixed #3013
|
2021-05-10 18:44:01 +02:00 |
|
The Busy Bot
|
d2ab1cf81e
|
[CI skip] New locale updates from Crowdin
|
2021-05-10 18:41:43 +02:00 |
|
a
|
efd3d133f2
|
Update ExplosiveTool.java
|
2021-05-10 11:11:02 -05:00 |
|
TheBusyBiscuit
|
7a06dc3064
|
Merge pull request #3003 from Slimefun/fix/hologram-dupes
Potentially fixed #2927
|
2021-05-09 17:04:29 +02:00 |
|
Varian Anora
|
10e3df78b8
|
Merge branch 'master' into fix/auto-disenchanter-strict-slot-order
|
2021-05-09 19:00:30 +07:00 |
|
Varian Anora
|
f5d1d3a947
|
Revert swapping item and secondItem
|
2021-05-09 18:59:54 +07:00 |
|
StarWishsama
|
7fef9d6604
|
refactor: use async
|
2021-05-09 18:11:42 +08:00 |
|
StarWishsama
|
3bf8217059
|
feat: introduced AutoEnchantProcessEvent
|
2021-05-09 14:21:07 +08:00 |
|
StarWishsama
|
5577a4e965
|
feat: support retrieve auto-enchanter for enchanting
|
2021-05-09 13:27:18 +08:00 |
|
TheBusyBiscuit
|
27224c55eb
|
Updated default item models file
|
2021-05-08 19:24:16 +02:00 |
|
TheBusyBiscuit
|
81223004bf
|
Default values for item models are now read from a resource file.
|
2021-05-08 19:22:54 +02:00 |
|
TheBusyBiscuit
|
d81b25717f
|
Added an exclusion for unit tests
|
2021-05-08 18:59:06 +02:00 |
|
TheBusyBiscuit
|
a82a5d28f9
|
Implemented Walshy's suggestion to improve performance even further
|
2021-05-08 18:49:56 +02:00 |
|
a
|
d3527a1885
|
Update ExplosiveTool.java
|
2021-05-08 01:38:13 -05:00 |
|
StarWishsama
|
bebd89df30
|
chore: dont mess up import, idea
|
2021-05-08 13:44:05 +08:00 |
|
StarWishsama
|
6b62a4f86c
|
feat: support to get the enchant book for auto enchant
|
2021-05-08 13:39:32 +08:00 |
|
Varian Anora
|
8d3d24bc5f
|
Revert to EnchantmentStorageMeta
|
2021-05-08 12:08:56 +07:00 |
|
Varian Anora
|
716c384349
|
Merge branch 'master' into fix/auto-disenchanter-strict-slot-order
|
2021-05-08 12:06:55 +07:00 |
|
TheBusyBiscuit
|
dc34ec8dfc
|
Merge branch 'master' into performance/networks
|
2021-05-07 14:15:30 +02:00 |
|
TheBusyBiscuit
|
5194dbb1db
|
Merge pull request #3031 from variananora/fix/pickaxe-of-the-seeker-localization
Update Pickaxe of The Seeker Localization
|
2021-05-07 14:14:51 +02:00 |
|
TheBusyBiscuit
|
4e417a89a0
|
[CI skip] Merge pull request #3029 from Slimefun/crowdin/master
New Crowdin updates
|
2021-05-07 14:13:55 +02:00 |
|
Varian Anora
|
847bab7a86
|
Fixes #2978
Fix is stolen from #2982
|
2021-05-07 10:19:36 +07:00 |
|
Martin Brom
|
e7662dd04f
|
Add grinding of higher level lumps back into 4 lower level lumps
|
2021-05-06 18:40:19 +02:00 |
|
Martin Brom
|
8ac9160e37
|
Add unicode arrow to the message
|
2021-05-06 18:18:26 +02:00 |
|
Martin Brom
|
e7ae14beaf
|
Add locale message for learning animation option
Add helper function to get value of selected option in the survival guide
|
2021-05-06 18:18:26 +02:00 |
|
Martin Brom
|
fd12521a0a
|
Add requested changes
Revert change in research test
|
2021-05-06 18:18:26 +02:00 |
|
Martin Brom
|
227621906c
|
Add the option to disable learning animations server & client side
|
2021-05-06 18:18:26 +02:00 |
|
TheBusyBiscuit
|
a4aebf7bcd
|
[CI skip] Translators are now read from a json file.
Next step is writing a GitHub action that auto-populates that file via
the Crowdin API
|
2021-05-06 15:56:55 +02:00 |
|
Varian Anora
|
cc714b1722
|
Update Pickaxe of The Seeker Localization
Moved locale path to follow current styling
Added Pickaxe of The Seeker error message when no ores were found.
|
2021-05-06 20:02:35 +07:00 |
|
TheBusyBiscuit
|
3e01e24b12
|
Update src/main/resources/languages/lv/messages.yml
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-05-06 13:20:17 +02:00 |
|
The Busy Bot
|
e084cf0fff
|
New translations researches.yml (Czech)
|
2021-05-06 12:59:04 +02:00 |
|
The Busy Bot
|
3a1da2a131
|
New translations messages.yml (Latvian)
|
2021-05-06 12:52:15 +02:00 |
|
The Busy Bot
|
b75f0a613b
|
New translations recipes.yml (German)
|
2021-05-06 12:45:23 +02:00 |
|
The Busy Bot
|
7da4e1962e
|
New translations messages.yml (German)
|
2021-05-06 12:45:22 +02:00 |
|
The Busy Bot
|
d037b600d9
|
New translations messages.yml (Vietnamese)
|
2021-05-06 11:13:16 +02:00 |
|
The Busy Bot
|
18830894c2
|
New translations researches.yml (German)
|
2021-05-05 18:42:22 +02:00 |
|
TheBusyBiscuit
|
8a1eba8fd4
|
[CI skip] Crowdin setup (squashed)
|
2021-05-05 18:10:02 +02:00 |
|
TheBusyBiscuit
|
81bf67b72c
|
Merge branch 'master' into fix/hologram-dupes
|
2021-05-04 10:08:49 +02:00 |
|
Freeze_Dolphin
|
c48ccc0149
|
Correction of wrongly spelled words.
|
2021-05-04 07:33:32 +00:00 |
|
Freeze_Dolphin
|
51b72d4dba
|
Revert "Correction of wrongly spelled words."
This reverts commit 7e74c5a8b2 .
|
2021-05-04 07:32:38 +00:00 |
|
Freeze_Dolphin
|
7e74c5a8b2
|
Correction of wrongly spelled words.
|
2021-05-04 04:52:58 +00:00 |
|
TheBusyBiscuit
|
e51fcde16f
|
Update OutputChest.java
|
2021-05-03 15:28:11 +02:00 |
|
TheBusyBiscuit
|
0b55c9e8a0
|
Updated author tag
|
2021-05-03 15:24:19 +02:00 |
|
TheBusyBiscuit
|
7b615a66f2
|
Fixes #3013
|
2021-05-03 15:22:13 +02:00 |
|
TheBusyBiscuit
|
399359ae25
|
Reduced memory usage for networks and enforce world limitation
|
2021-05-03 15:19:33 +02:00 |
|
TheBusyBiscuit
|
c29d0e5530
|
Fixed #3012
|
2021-05-03 13:05:22 +02:00 |
|
svr333
|
e7557ca680
|
Merge branch 'master' into fix/hologram-dupes
|
2021-05-01 01:46:58 +02:00 |
|
TheBusyBiscuit
|
df7b262d14
|
Fixed #3007
|
2021-05-01 00:09:38 +02:00 |
|
TheBusyBiscuit
|
9f3f23fb75
|
Potentially fixed #2927
|
2021-04-30 16:18:24 +02:00 |
|
TheBusyBiscuit
|
a0695e0df4
|
Merge pull request #2994 from Mooy1/android-click-fix
Fix android click handler errors while moving
|
2021-04-30 12:51:34 +02:00 |
|
TheBusyBiscuit
|
5f1aeecdbf
|
[CI skip] Updated changelog
Also fixed MultiCategory not respecting guide main page index.
|
2021-04-30 12:51:22 +02:00 |
|
TheBusyBiscuit
|
e609e9e0ae
|
Merge pull request #2993 from Mooy1/guide-history-fix
Fixed #2593
|
2021-04-30 12:36:47 +02:00 |
|
TheBusyBiscuit
|
8c0fbfb295
|
More refactoring
|
2021-04-30 11:22:18 +02:00 |
|
TheBusyBiscuit
|
2382b940f1
|
Refactoring
|
2021-04-30 10:54:40 +02:00 |
|
TheBusyBiscuit
|
b92de66a27
|
[CI skip] Added missing import
|
2021-04-30 10:32:57 +02:00 |
|
TheBusyBiscuit
|
c215940cb9
|
Marked some items as unplaceable
|
2021-04-29 21:18:32 +02:00 |
|
TheBusyBiscuit
|
586e0516cf
|
[Ci skip] Some refactoring
|
2021-04-29 20:48:05 +02:00 |
|
TheBusyBiscuit
|
ced3cf9f50
|
Removed some deprecated methods
|
2021-04-29 20:37:54 +02:00 |
|
TheBusyBiscuit
|
90c8e2f278
|
Fixes #2999
|
2021-04-29 17:52:21 +02:00 |
|
a
|
a1619206ea
|
Update ProgrammableAndroid.java
|
2021-04-27 09:36:16 -05:00 |
|
a
|
bf5ada4eab
|
Update ProgrammableAndroid.java
|
2021-04-27 09:34:52 -05:00 |
|
a
|
f79840bf66
|
changes
|
2021-04-27 09:26:56 -05:00 |
|
Riley
|
31ddf8e7de
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-04-26 18:55:24 -05:00 |
|
a
|
a1a6253961
|
Update ProgrammableAndroid.java
|
2021-04-26 18:43:10 -05:00 |
|
a
|
61ff68d34a
|
fix
|
2021-04-26 18:15:07 -05:00 |
|
TheBusyBiscuit
|
757d7613ac
|
[CI skip] Formatting
|
2021-04-26 18:06:25 +02:00 |
|
Rothes
|
a59f5cb067
|
Update
|
2021-04-26 17:20:44 +08:00 |
|
Rothes
|
ff58e53145
|
Update
|
2021-04-26 15:17:39 +08:00 |
|
Rothes
|
205f8d02b1
|
Merge branch 'master' into master
|
2021-04-26 12:28:03 +08:00 |
|
TheBusyBiscuit
|
f048d0276b
|
Merge pull request #2982 from martinbrom/fix/auto-enchanter-fixed-order
Fixes #2977
|
2021-04-25 20:13:59 +02:00 |
|
TheBusyBiscuit
|
a7835197a5
|
Some minor code improvements
|
2021-04-25 20:13:51 +02:00 |
|
TheBusyBiscuit
|
d91d9c2856
|
Removed Automated Crafting Chamber
|
2021-04-25 19:49:17 +02:00 |
|
TheBusyBiscuit
|
bffef56407
|
Added Category#setTier()
|
2021-04-25 19:47:58 +02:00 |
|
TheBusyBiscuit
|
c975fe234e
|
Fixed #2989
|
2021-04-25 19:29:57 +02:00 |
|
Daniel Walsh
|
2f27ddc6a6
|
Merge pull request #2988 from martinbrom/fix/talisman-of-the-anvil
Fixes NPE when hand is empty while talisman of the anvil triggers
|
2021-04-24 12:22:59 +01:00 |
|
Martin Brom
|
a6f3696719
|
Fixes NPE when hand is empty while talisman of the anvil triggers
Resolves #2987
|
2021-04-24 12:22:40 +02:00 |
|
TheBusyBiscuit
|
1c5372d261
|
Complete restructure of language files
|
2021-04-23 20:48:24 +02:00 |
|
TheBusyBiscuit
|
1982ec0aeb
|
Reorganized language files
|
2021-04-23 19:22:25 +02:00 |
|
TheBusyBiscuit
|
34421d4a12
|
More refactoring
|
2021-04-23 19:01:41 +02:00 |
|
TheBusyBiscuit
|
a3a9ee4b90
|
Various code improvements
|
2021-04-23 18:58:35 +02:00 |
|
TheBusyBiscuit
|
8aeda66c5e
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
|
2021-04-23 18:30:12 +02:00 |
|
TheBusyBiscuit
|
f017088f42
|
[CI skip] Small docs changes
|
2021-04-23 18:29:55 +02:00 |
|
Martin Brom
|
a94926dfaf
|
Small Auto-Enchanter cleanup
|
2021-04-23 17:12:26 +02:00 |
|
Martin Brom
|
cfb9f53057
|
Auto-Enchanter now checks both combinations of book and item in its inventory
Fixes #2977
|
2021-04-23 17:03:02 +02:00 |
|
Rothes
|
31a571455c
|
Update AbstractEnchantmentMachine.java
|
2021-04-23 20:08:40 +08:00 |
|
Rothes
|
67c0947dc8
|
Added toggle setting and some edit.
|
2021-04-23 20:04:00 +08:00 |
|
Daniel Walsh
|
b0f2fc8c4d
|
Merge pull request #2967 from variananora/add-suggestion-311
|
2021-04-23 12:50:41 +01:00 |
|
TheBusyBiscuit
|
c2ec4693ac
|
Merge pull request #2963 from martinbrom/feature/coalblock-carbon
Add Block of Coal -> Carbon recipe to the Carbon Press and Compressor
|
2021-04-23 13:46:22 +02:00 |
|
BuildTools
|
a846d4ea1b
|
Re-added check null and empty.
|
2021-04-23 19:29:36 +08:00 |
|