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

6925 Commits

Author SHA1 Message Date
The Busy Bot
a4af25938e
[CI skip] New Crowdin updates (#3050)
* New translations messages.yml (German)

* New translations messages.yml (Latvian)
2021-05-13 10:57:02 +02:00
TheBusyBiscuit
60aef3a522
[CI skip] Merge pull request #3047 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.10.0
2021-05-12 17:39:31 +02:00
Daniel Walsh
4e731150cf
Add the item to the research message 2021-05-12 16:23:29 +01:00
Martin Brom
b1a70bfb9a Tweak the cost of teleportation and capacity once more 2021-05-12 16:15:46 +02:00
Renovate Bot
fbd3bb1eac
Update dependency org.mockito:mockito-core to v3.10.0 2021-05-12 11:23:20 +00:00
TheBusyBiscuit
fa07d081e0
Merge pull request #2983 from martinbrom/feature/learning-animation-option
Add the option to disable learning animations server & client side
2021-05-12 12:39:53 +02:00
TheBusyBiscuit
31a81d0d7e
[CI skip] Updated changelog 2021-05-12 12:39:35 +02:00
Daniel Walsh
b8dfa5908b
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java 2021-05-12 11:36:11 +01:00
Martin Brom
4995ab8227 Change cost of teleportation to int
Remove FloatRangeSetting
2021-05-12 10:39:14 +02:00
TheBusyBiscuit
69277aad46
[CI skip] Merge pull request #3045 from Slimefun/renovate/pascalgn-automerge-action-0.x
Update pascalgn/automerge-action action to v0.14.1
2021-05-12 10:33:54 +02:00
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
Renovate Bot
9fad375a86
Update pascalgn/automerge-action action to v0.14.1 2021-05-12 00:28:14 +00:00
TheBusyBiscuit
f607cfa583
[Ci skip] Updated auto squash workflow 2021-05-12 00:15:21 +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
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
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
2ad96fe9dd Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations 2021-05-10 10:51:50 +02:00
TheBusyBiscuit
1d58bca4d3 Made requested changes 2021-05-10 10:51:37 +02: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