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

7051 Commits

Author SHA1 Message Date
Andrew Wong
4704b9fa8f
Check for ItemStackWrappers in ItemStackAndInteger 2021-05-18 12:05:38 +02:00
Andrew Wong
6f042e60ad
Deprecate the public constructor of ItemStackWrapper(ItemStack). More docs and use #ofItem where possible 2021-05-17 21:46:59 +02:00
Andrew Wong
727c8d34b9
Add ItemStackWrapper#ofItem, try not to use duplicate ItemStackWrappers in CargoNet 2021-05-17 21:36:10 +02:00
Renovate Bot
d705e99139
Update actions/setup-java action to v2.1.0 2021-05-17 14:32:39 +00:00
TheBusyBiscuit
f822bdd12d
Merge pull request #3044 from martinbrom/feature/portable-teleporter
Add PortableTeleporter
2021-05-16 21:53:37 +02:00
TheBusyBiscuit
5b8440daca
[CI skip] Updated changelog 2021-05-16 21:52:27 +02:00
Martin Brom
f2ee8a27f3 Add annotations and clarify naming for AncientAltar related classes 2021-05-16 12:04:44 +02:00
TheBusyBiscuit
f12e68dd72 [CI skip] Fixed some of the technical debt caused by recent PRs 2021-05-16 11:55:59 +02:00
Martin Brom
092808b847 Check for any GoldPan drops with zero chance
Resolves #3064
2021-05-16 10:18:18 +02:00
TheBusyBiscuit
3645aba487
[CI skip] Merge pull request #3063 from Slimefun/renovate/junit5-monorepo
Update dependency org.junit.jupiter:junit-jupiter to v5.7.2
2021-05-15 16:12:06 +02:00
Renovate Bot
452f262e38
Update dependency org.junit.jupiter:junit-jupiter to v5.7.2 2021-05-15 13:51:29 +00:00
TheBusyBiscuit
f4b4733146
Merge pull request #3061 from martinbrom/fix/bows-ignore-shields
Fix Icy Bow ignores shields
2021-05-15 12:42:23 +02:00
TheBusyBiscuit
2061891984
[CI skip] Updated changelog 2021-05-15 12:42:09 +02:00
Martin Brom
2ac333b037 Add a configurable step delay to the Ancient Altar 2021-05-15 10:53:48 +02:00
Martin Brom
0cced1a8d0 IcyBow now takes shielded players into consideration
Resolves #3060
2021-05-14 22:57:38 +02:00
a
f0fc06fd15 Dont load chunks, menus, universal menus multiple times 2021-05-14 01:24:45 -05:00
TheBusyBiscuit
045b6fcf4b
[CI skip] Merge pull request #3056 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1
2021-05-13 21:16:56 +02:00
Renovate Bot
20a5031ca7
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1 2021-05-13 18:34:06 +00:00
Martin Brom
872ff0976e Add Javadocs to DirtyChestMenu::pushItem 2021-05-13 14:06:39 +02:00
Martin Brom
c52d85035b Remove redundant check for space in inventory
Revert changelog change
2021-05-13 13:51:08 +02:00
Martin Brom
3baaf8c118 Update changelog 2021-05-13 12:59:31 +02:00
Martin Brom
1832cf4eff Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory 2021-05-13 12:55:31 +02:00
TheBusyBiscuit
1015b2791a
[CI skip] Fixed PR workflows (#3051)
* Update auto-squash.yml

* Hopefully fixed the workflow here.

* Just print it all out

* Update auto-squash.yml

* Update auto-squash.yml

* Update auto-approve.yml
2021-05-13 11:13:43 +02:00
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