1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

6641 Commits

Author SHA1 Message Date
Martin Brom
18c36ab038 Add FloatRangeSetting
Add PortableTeleporter research
Add ItemSetting to PortableTeleporter to configure the cost of teleporting
Change default cost of teleporting to 5 J
Fix wrong word in PortableTeleporter lore
2021-05-12 10:28:42 +02:00
Martin Brom
5b5020f9cf Add PortableTeleporter
Add TeleportationManager::openTeleporterGUI overload without network complexity parameter, which then gets calculated from the given ownerUUID
2021-05-11 23:58:49 +02:00
TheBusyBiscuit
9c05237af3
Merge pull request #3037 from StarWishsama/chore/auto-enchant-event
Introduced AsyncAutoEnchanterProcessEvent
2021-05-11 14:13:37 +02:00
TheBusyBiscuit
c9596b8aaf
[CI skip] Updated changelog 2021-05-11 14:13:30 +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
TheBusyBiscuit
9b3cce1cd1
[CI skip] Updated changelog 2021-05-09 16:02:18 +02:00
Daniel Walsh
e7ef924bf8
Merge pull request #3033 from variananora/fix/auto-disenchanter-strict-slot-order 2021-05-09 14:58:39 +01: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
96f467d9f1
[CI skip] Fixed yaml linter issues 2021-05-07 14:32:15 +02:00
TheBusyBiscuit
e64028486f [CI skip] Added autosquash workflow for Crowdin PRs 2021-05-07 14:26:53 +02: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
TheBusyBiscuit
295d3dae76
[CI skip] Updated changelog 2021-05-07 14:13:15 +02:00
TheBusyBiscuit
13c6d5d273
Merge pull request #3032 from martinbrom/feature/lump-grinding
Add grinding of higher level lumps back into 4 lower level lumps
2021-05-07 14:11:09 +02:00
TheBusyBiscuit
9f9ae687a7
[CI skip] Updated changelog 2021-05-07 14:10:54 +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
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
Daniel Walsh
bea34966c1
[CI Skip] Merge pull request #3028 from Slimefun/crowdin/master
New Crowdin updates
2021-05-06 11:43:41 +01:00
The Busy Bot
d037b600d9 New translations messages.yml (Vietnamese) 2021-05-06 11:13:16 +02:00