Martin Brom
93de94d036
Use Regex to find the correct "Uses left" line
...
Make LimitedUseItem::setMaxUseCount return LimitedUseItem
2021-06-21 15:34:36 +02:00
TheBusyBiscuit
57f7553f74
Merge pull request #3126 from Slimefun/chore/recommend-java-16
...
Encourage Java 16 on older versions
2021-06-21 14:30:10 +02:00
EpicPlayerA10
fe9cdb3a77
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-06-18 17:24:17 +02:00
EpicPlayerA10
e14c63ce76
Add a freeze effect on the icy bow
2021-06-18 17:14:36 +02:00
EpicPlayerA10
31d0589733
Add a freeze effect on the icy bow
2021-06-18 17:14:21 +02:00
EpicPlayerA10
55d8d9fdcd
Add a freeze effect on the icy bow
2021-06-18 17:13:21 +02:00
BuildTools
1c4d2db8ec
Add a freeze effect on the icy bow
2021-06-18 16:59:51 +02:00
TheBusyBiscuit
96574bed6f
Fixes #3116
2021-06-18 15:09:03 +02:00
TheBusyBiscuit
805c2eafcc
Added a new feature to the debug fish
...
SlimefunTag support
2021-06-18 15:08:24 +02:00
TheBusyBiscuit
069896ff66
Switch to WARNING
2021-06-17 11:21:28 +02:00
TheBusyBiscuit
7fcb605d4d
Encourage Java 16 on older versions
2021-06-17 10:53:38 +02:00
Senne
919166cb80
Replace 1 water rune with nether star
2021-06-15 16:34:58 +02:00
Martin Brom
04e99e7e64
Change LimitedUseItem count to use setters instead
...
Fix annotations
2021-06-15 12:06:59 +02:00
Senne
0e851f7be5
Add trident recipe
2021-06-14 14:56:48 +02:00
Senne
7865ad92fc
Add diamond -> 24 coal conversion
2021-06-14 14:29:58 +02:00
svr333
ffcb8d7146
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-06-14 14:20:16 +02:00
Martin Brom
0cde52331e
Add LimitedUseItem - base class for items with limited uses
...
Update StormStaff to extend LimitedUseItem
Add 'usesLeft' function to LoreBuilder
2021-06-13 13:27:38 +02:00
TheBusyBiscuit
59a548ef66
[CI skip] Make javadocs happy
2021-06-12 15:59:10 +02:00
TheBusyBiscuit
1d052bda9c
Some formatting
2021-06-12 00:31:42 +02:00
TheBusyBiscuit
7008e36e68
Added new spawn eggs
2021-06-12 00:29:26 +02:00
TheBusyBiscuit
15da49392a
Updated ore tags
2021-06-12 00:21:31 +02:00
Daniel Walsh
6b6883ca4e
Variable for minHeight
2021-06-11 16:10:26 +01:00
Daniel Walsh
8912ca1ea0
Improve loop in SeismicAxe
2021-06-11 15:58:38 +01:00
Daniel Walsh
ea98a3e5a3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-06-11 15:36:51 +01:00
Daniel Walsh
2513b71e6f
Final changes
2021-06-11 15:30:20 +01:00
Daniel Walsh
ede931cdcd
Create WorldUtils
2021-06-11 13:41:19 +01:00
Daniel Walsh
1e1889b66d
Goats can produce milk
2021-06-11 13:33:21 +01:00
Daniel Walsh
196c5d4e97
Fix tag for 1.17 (maybe??)
2021-06-11 11:44:48 +01:00
Daniel Walsh
408468ce6a
Add min y to elevator and seismic axe
2021-06-11 11:37:04 +01:00
Daniel Walsh
d065951b9f
1.17 recipes provided by martin
2021-06-11 11:24:09 +01:00
Daniel Walsh
eb4c6aa22b
1.17 support
2021-06-11 11:19:43 +01:00
Senne
e40f7996bf
Clean up equalsItemMeta()
2021-06-09 12:36:48 +02:00
Martin Brom
96ec2ba1f6
FlexCategories can now be made visible in CheatSheetSlimefunGuide
2021-06-06 20:31:24 +02:00
Martin Brom
f34cc35646
Hidden items are now not shown in the SlimefunGuide
...
Resolves #3105
2021-06-06 18:24:05 +02:00
TheBusyBiscuit
cc23211504
Added a startup warning for when CS-CoreLib is still installed
2021-06-06 11:49:44 +02:00
The Busy Bot
23c79c293a
[CI skip] New locale updates from Crowdin
2021-06-06 11:11:15 +02:00
TheBusyBiscuit
326a431151
Merge pull request #3102 from Slimefun/api/add-collectAverageTimings-for-timings
...
Add collectAverageTimings to SlimefunProfiler
2021-06-04 00:56:12 +02:00
Daniel Walsh
9696f8a22f
Requested changes
2021-06-03 22:35:18 +01:00
TheBusyBiscuit
448794fd74
Merge pull request #3077 from Mooy1/entity-hit-handler
...
Added WeaponUseHandler
2021-06-03 23:21:42 +02:00
Daniel Walsh
699be3584b
Correct message
2021-06-03 21:54:52 +01:00
Daniel Walsh
d6bcf17208
Add collectAverageTimings to SlimefunProfiler;
2021-06-03 21:26:39 +01:00
TheBusyBiscuit
5a1405014f
[CI skip] Removed deprecated events and methods
2021-06-03 19:19:14 +02:00
TheBusyBiscuit
ce32681d1b
Merge pull request #3098 from Seggan/dev
...
Add charcoal -> coal recipe
2021-06-03 19:13:41 +02:00
TheBusyBiscuit
ee14c513ba
Merge pull request #3097 from Slimefun/chore/config-cleanup
...
Change config for consistency and improvement
2021-06-03 19:00:19 +02:00
TheBusyBiscuit
b7c6a431a5
[CI skip] Lock in RC-24 release date
2021-06-03 18:57:07 +02:00
TheBusyBiscuit
6071e1b952
[CI skip] Updated style preferences in contributing.md
2021-06-03 18:38:39 +02:00
Daniel Walsh
8de85ac315
Simplified
2021-06-03 15:24:14 +01:00
Daniel Walsh
cb22ab7eb7
Remove old compat change
2021-06-03 12:33:00 +01:00
Riley
8cda831ba1
Did changes
2021-06-02 11:07:06 -05:00
Seggan
09f0f07db4
Add charcoal -> carbon recipe
2021-06-01 11:42:18 -04:00
Daniel Walsh
11b20b2744
Disable backwards compat by default
...
While we do have code which sets this to true if there is no data-storage dir there are many cases where that dir is copied however the config is not meaning it gets enabled.
2021-05-31 18:50:51 +01:00
Daniel Walsh
b73063ef7b
Update config.yml
2021-05-31 18:49:14 +01:00
TheBusyBiscuit
0224f94edf
Merge pull request #3096 from martinbrom/fix/auto-brewer
...
AutoBrewer fixes
2021-05-31 15:05:57 +02:00
Martin Brom
33340d0dd0
Apply suggestions from code review
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-05-31 10:32:56 +02:00
TheBusyBiscuit
d39a5c1ba2
Fixed #3086
2021-05-31 10:26:42 +02:00
Martin Brom
bd6efaf632
Fix AutoBrewer stripping redstone/glowstone modifiers when fermenting a potion
...
Resolves #3095
2021-05-31 10:08:58 +02:00
Martin Brom
87b0812c2e
Fix IllegalArgumentException when trying to brew invalid potions
...
Resolves #3093
2021-05-31 10:08:58 +02:00
Martin Brom
d23f1265b3
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-05-30 13:49:43 +02:00
Martin Brom
cda2228a7d
Fix IllegalArgumentException when ChestTerminal is requesting items
...
Resolves #3091
2021-05-30 13:20:09 +02:00
TheBusyBiscuit
cf362f7c7a
Fixed #3087
2021-05-29 10:35:41 +02:00
TheBusyBiscuit
ab2049d1d2
Fixed #3088
2021-05-29 10:31:38 +02:00
TheBusyBiscuit
477cad5487
Fixed #3085
2021-05-29 00:40:32 +02:00
TheBusyBiscuit
76dda9a439
Fixed #3084
2021-05-29 00:21:37 +02:00
Jeffrey Kosse
990cc48feb
did requested changes
2021-05-28 19:38:22 +02:00
Jeffrey Kosse
1b2d3e683e
removed redundant formatter
2021-05-28 18:30:35 +02:00
Jeffrey Kosse
ab534dc4f4
did requested changes
2021-05-28 18:28:49 +02:00
J3fftw
ba4767ae05
Update ErrorReport.java
2021-05-28 18:24:28 +02:00
J3fftw
3205d83e35
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-05-28 18:23:17 +02:00
Jeffrey Kosse
8f6d9209c1
added time and date to error report
2021-05-28 18:16:24 +02:00
TheBusyBiscuit
a36f487fff
Added back setters and getters for GEOMiner tier configuration
2021-05-28 15:10:55 +02:00
TheBusyBiscuit
6c9f8721be
Merge pull request #2779 from Slimefun/api/machine-operations
...
Rewrote Machine Processing API
2021-05-28 14:44:05 +02:00
Riley
4dad8a1589
Did changes
2021-05-27 10:00:22 -05:00
TheBusyBiscuit
3ff1197971
Merge pull request #3080 from Mooy1/slimefun-item-small-recipes
...
Easier SlimefunItem creation with small recipe
2021-05-27 13:14:11 +02:00
Riley
80a31b02fc
Update SlimefunItem.java
2021-05-26 14:06:27 -05:00
Senne
3c31792532
Re-add imports
2021-05-25 22:31:06 +02:00
svr333
ba617a6ea6
Merge branch 'master' into api/machine-operations
2021-05-25 20:05:59 +02:00
TheBusyBiscuit
1be165ca44
Fixed recipe types showing missing string message
2021-05-25 11:04:59 +02:00
Riley
2e91ebe0d2
Made handler and listener
2021-05-24 20:14:12 -05:00
TheBusyBiscuit
709b329c78
Hotfix for addons using old ItemStackWrapper constructor
2021-05-25 01:34:55 +02:00
TheBusyBiscuit
fcfa164583
Bump recommended java versions notice to Java 16
2021-05-24 20:15:07 +02:00
TheBusyBiscuit
4ed9dd7e59
Fixed #3075
2021-05-24 20:07:03 +02:00
TheBusyBiscuit
3fc802ef8c
[CI skip] Formatting and code cleanup
2021-05-24 18:18:21 +02:00
TheBusyBiscuit
1111c809dd
[CI skip] Added Unit Test which makes sure Slimefun is spelled correctly
2021-05-24 17:40:35 +02:00
The Busy Bot
27013f5287
[CI skip] New locale updates from Crowdin
2021-05-24 17:21:28 +02:00
TheBusyBiscuit
8a3d5cedc4
Merge pull request #3048 from Slimefun/fix/improve-research-message
...
Add the item to the research message
2021-05-24 16:40:18 +02:00
TheBusyBiscuit
a6e3c460fd
Merge pull request #3068 from md5sha256/feature/optimized-cargo
...
Optimized use of ItemStackWrapper in the CargoNetworkTask
2021-05-24 14:24:24 +02:00
TheBusyBiscuit
c1de61d1c1
Merge branch 'fix/improve-research-message' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message
2021-05-24 13:09:57 +02:00
TheBusyBiscuit
3e4af70e10
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message
2021-05-24 13:09:06 +02:00
TheBusyBiscuit
213c2b0e4d
Changed color to white now
2021-05-24 13:07:46 +02:00
TheBusyBiscuit
da6c909d3a
Update src/main/resources/languages/en/messages.yml
2021-05-24 13:06:54 +02:00
TheBusyBiscuit
31af8f3b25
Fixed #3053
2021-05-24 13:04:45 +02:00
TheBusyBiscuit
fd2d30a3ae
Validate progress arguments
2021-05-24 11:23:36 +02:00
TheBusyBiscuit
466990a03e
Switch to a Concurrent Map
2021-05-24 11:18:13 +02:00
TheBusyBiscuit
a249ca7848
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations
2021-05-24 11:09:52 +02:00
Andrew Wong
8fb1c7cdfb
Enforce nullability
2021-05-22 16:04:43 +02:00
Andrew Wong
5e94f454c8
Fix documentation for ItemStackAndInteger and tests for ItemStackWrapper
2021-05-21 13:29:45 +02:00
Andrew Wong
57b559e81d
Fix nullability and docs
2021-05-19 18:57:29 +02:00
Andrew Wong
7e43e68f68
Method renames, update docs and unit tests
2021-05-19 18:19:04 +02:00
TheBusyBiscuit
e4225d7aec
Fixed a permissions issue with /sf charge
2021-05-19 17:36:10 +02:00
TheBusyBiscuit
2e5bedc932
Merge pull request #3062 from martinbrom/feature/configurable-altar-speed
...
Add a configurable step delay to the Ancient Altar
2021-05-19 17:26:26 +02:00
TheBusyBiscuit
58fbc423af
Merge pull request #3052 from martinbrom/fix/woodcutter-android-stuck fixes #2964
...
Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory
2021-05-19 17:25:50 +02:00
TheBusyBiscuit
eb34c01f86
Merge pull request #3058 from Mooy1/fix/block-menu-loading
...
Fixed menu loading issues and probably improved BlockStorage load times
2021-05-19 17:25:11 +02:00
TheBusyBiscuit
6353720d39
Merge pull request #3065 from martinbrom/fix/gold-pan-exception
...
Fixed an Exception when any GoldPan drops have zero chance of dropping
2021-05-19 14:03:08 +02:00
TheBusyBiscuit
593e0a08c9
[CI skip] Removed deprecated class
2021-05-19 10:45:30 +02:00
a
1e459693fb
Update BlockStorage.java
2021-05-18 11:45:01 -05:00
a
9db161569d
Update BlockStorage.java
2021-05-18 11:44:21 -05:00
Andrew Wong
3dfc83ac6a
Try to inject and use the ItemStackWrapper into frequently used CargoUtils methods
2021-05-18 14:12:28 +02:00
Andrew Wong
9e6aa5b39a
Actually use the wrapper in CargoNetTask#distributeItems
2021-05-18 13:40:10 +02:00
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
TheBusyBiscuit
f822bdd12d
Merge pull request #3044 from martinbrom/feature/portable-teleporter
...
Add PortableTeleporter
2021-05-16 21:53:37 +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
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
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
1832cf4eff
Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory
2021-05-13 12:55:31 +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
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
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
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
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
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
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
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
7c0b29f866
Merge branch 'master' into api/machine-operations
2021-04-30 10:13:25 +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
TheBusyBiscuit
a02d809a72
Implemented Event.
2021-04-27 18:02:53 +02:00
TheBusyBiscuit
7bd588175b
More work on this, added a new event and deprecated the old ones.
2021-04-27 17:08:09 +02:00
TheBusyBiscuit
57df9e8df9
Refactoring and documentation
2021-04-27 16:59:39 +02:00
a
a1619206ea
Update ProgrammableAndroid.java
2021-04-27 09:36:16 -05:00
TheBusyBiscuit
29c568fdbf
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations
2021-04-27 16:34:58 +02: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
Varian Anora
45d6c376af
Update researches_en.yml
2021-04-22 20:14:52 +07:00
Varian Anora
23d4aad256
Merge branch 'master' into add-suggestion-311
2021-04-22 20:12:47 +07:00
Daniel Walsh
9e5162179f
[CI Skip] Merge pull request #2970 from IAmSorryArt/protected
2021-04-22 11:03:03 +01:00
Rothes
07167442f9
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-22 17:33:27 +08:00
Varian Anora
6840efe2f1
Changed Auto Disenchanter recipe and added new research for tier two enchanters.
...
Changed Auto Disenchanter Recipe to:
```
Auto Disenchanter II
Speed: 3x
Power: 48J/s
Buffer: 1024J
Recipe:
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Blistering Ingot (100%)
D = Auto Disenchanter
E = Wither Proof Obsidian
F = Big Capacitor```
Changed wither proof obsidian with big capacitor for the buffer size.
Added new research for tier two enchanters with 48 exp levels on ID 277.
2021-04-22 12:30:58 +07:00
Rothes
16a5a2ce06
Update
2021-04-22 11:58:52 +08:00
Varian Anora
9dec7b710d
Merge branch 'master' into add-suggestion-311
2021-04-22 10:39:45 +07:00
BuildTools
76f5848e08
Use ItemName in default value instead of Identifier
2021-04-21 22:34:17 +08:00
Rothes
ecb23fa5e5
Update
2021-04-21 18:02:14 +08:00
BuildTools
27bbca1502
Update
2021-04-21 13:06:16 +08:00
BuildTools
8eb196caaa
a
2021-04-21 12:58:30 +08:00
TheBusyBiscuit
c0058a3994
[CI skip] Refactored and cleaned up Auto (Dis)enchanters
2021-04-20 17:35:51 +02:00
Varian Anora
2803fbe61e
Merge branch 'master' into add-suggestion-311
2021-04-20 19:00:37 +07:00
IAmSorry
a16e1f6efc
Fixed the wrong protected :)
2021-04-19 22:30:07 +02:00
TheBusyBiscuit
0fbb9b2d9b
[CI skip] 200+ contributors, we need a third page 👀
2021-04-19 20:15:56 +02:00
IAmSorry
04b901928c
Change visibility to protected 19
2021-04-19 17:30:12 +02:00
IAmSorry
357898fe8e
Change visibility to protected 18
2021-04-19 17:28:47 +02:00
IAmSorry
cc39df17ac
Change visibility to protected 17
2021-04-19 17:26:34 +02:00
IAmSorry
86e73631c7
Change visibility to protected 16
2021-04-19 17:25:09 +02:00
IAmSorry
ce86abca47
Change visibility to protected 15
2021-04-19 17:23:40 +02:00
IAmSorry
6d36b43ced
Change visibility to protected 14
2021-04-19 17:22:31 +02:00
IAmSorry
ecda25819b
Change visibility to protected 13
2021-04-19 17:21:07 +02:00
IAmSorry
b0a8ab55b9
Change visibility to protected 12
2021-04-19 17:20:13 +02:00
IAmSorry
a0b559330d
Change visibility to protected 11
2021-04-19 17:19:11 +02:00
IAmSorry
848725c42b
Change visibility to protected 10
2021-04-19 17:18:02 +02:00
IAmSorry
e7a92113d1
Change visibility to protected 9
2021-04-19 17:17:19 +02:00
IAmSorry
d1259888ce
Change visibility to protected 8
2021-04-19 17:15:36 +02:00
IAmSorry
54309e1f56
Change visibility to protected 7
2021-04-19 17:14:20 +02:00
IAmSorry
96715da55a
Change visibility to protected 6
2021-04-19 17:13:14 +02:00
IAmSorry
6de81be703
Change visibility to protected 5
2021-04-19 17:11:20 +02:00
IAmSorry
7efd07da10
Change visibility to protected 4
2021-04-19 17:08:56 +02:00
IAmSorry
c28ad40cf7
Change visibility to protected 3
2021-04-19 17:07:08 +02:00
IAmSorry
a222ec14dc
Changing the visibility to protected 2
2021-04-19 17:03:58 +02:00
IAmSorry
c574065470
Change visibility to protected
2021-04-19 17:02:19 +02:00
TheBusyBiscuit
dcc5648c8f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-19 10:36:43 +02:00
Varian Anora
afc47f095c
Fix energy consumption on Auto Disenchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:21 +07:00
Varian Anora
4a949de996
Fix energy consumption on Auto Enchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:07 +07:00
Varian Anora
37d7772f02
Add tier II machines to Auto Enchanter and Auto Disenchanter
...
Auto Enchanter II
Speed 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | F | E |
A = Reinforced Plate
B = Big Capasitor
C = Blistering Ingot (100%)
D = Auto Enchanter
E = Wither Proof Obsidian
F = Synthetic Diamond
Auto Disenchanter II
Speed: 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Carbonado
D = Auto Enchanter II
E = Wither Proof Obsidian
2021-04-18 20:04:43 +07:00
TheBusyBiscuit
e59a5926c4
Code cleanup
2021-04-18 10:35:39 +02:00
TheBusyBiscuit
b20353557f
Photovoltaic Cells can no longer be placed
2021-04-18 10:11:32 +02:00
Varian Anora
473c58d720
Update GrindStone.java
2021-04-18 12:12:30 +07:00
Martin Brom
1c820196ef
Add Block of Coal -> Carbon recipe to the CarbonPress and Compressor
2021-04-17 14:41:24 +02:00
TheBusyBiscuit
f91481db1c
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
...
Conflicts:
CHANGELOG.md
2021-04-17 09:51:24 +02:00
Daniel Walsh
bf22f40f99
Oops forgot one validate
2021-04-17 08:39:56 +01:00
TheBusyBiscuit
d2e17af2a1
Removed SlimefunBlockHandler
2021-04-16 15:05:39 +02:00
TheBusyBiscuit
aa85388480
Renamed Solar Panel to Photovoltaic Cell
2021-04-16 14:55:49 +02:00
TheBusyBiscuit
cb3e9dfbeb
[CI skip] Refactoring
2021-04-16 14:50:06 +02:00
Daniel Walsh
448d6ca565
Fix nullability - not sure why this wasnt flagged...
2021-04-15 12:23:02 +01:00
Daniel Walsh
38a2246561
Fixes #2942
2021-04-14 12:15:55 +01:00
TheBusyBiscuit
53471f1177
[CI skip] Refactoring
2021-04-10 21:03:03 +02:00
TheBusyBiscuit
485dec746b
Merge pull request #2951 from Slimefun/api/auto-enchant-event
...
AutoEnchantEvent
2021-04-10 19:12:03 +02:00
Daniel Walsh
c8bf364e8f
no idea what you mean :eyes
2021-04-10 16:28:46 +01:00
TheBusyBiscuit
8be5673b7f
Merge pull request #2950 from md5sha256/feature/optimized-cargo
...
Optimizations to cargo
2021-04-10 17:20:21 +02:00
Daniel Walsh
20855c6977
AutoEnchantEvent
2021-04-10 15:36:47 +01:00
Andrew Wong
270b907582
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-10 16:30:47 +02:00
Daniel Walsh
2e682c185d
Merge pull request #2929 from RobotHanzo/fix/unbreaking-misbehaviour
2021-04-10 13:51:02 +01:00
Daniel Walsh
63e3f553ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
2021-04-10 13:40:28 +01:00
TheBusyBiscuit
44abfe7ea5
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
...
api/machine-operations
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AGenerator.java
2021-04-09 20:33:14 +02:00
TheBusyBiscuit
b4b0636cd7
Added magma cream/block to slime ball/block recipes to Freezer
2021-04-09 19:06:19 +02:00
TheBusyBiscuit
2ef332a003
Lowered "Magma block -> Sulfate" recipe to only require 1 magma block
2021-04-09 18:54:16 +02:00
TheBusyBiscuit
dbda4d0b23
Added a deprecation warning to the SlimefunBlockHandler
...
Also converted the remaining machines to the new system
2021-04-09 18:30:27 +02:00
Andrew Wong
debbc5bd17
Code format fixes, use an ArrayDeqeue in CargoNet#distributeItems
2021-04-09 14:20:23 +02:00
Andrew Wong
6c0c95c138
Fix star import
2021-04-09 00:19:41 +02:00
Andrew Wong
bccb2f38d5
Optimizations to cargo
...
This commit introduces two optimizations to cargo handling:
- Utilization of regex to validate integers in CargoNet#getFrequency,
- Smart shallow-cloning in CargoNetworkTask: using an ArrayList when round-robin is disabled
2021-04-08 23:46:43 +02:00
TheBusyBiscuit
e1f0e0cd6c
Converted more machines to the new BlockBreakHandler
2021-04-08 13:34:18 +02:00
TheBusyBiscuit
e52b1a92c7
Fixes #2944
2021-04-07 16:34:39 +02:00
TheBusyBiscuit
96f657f6e7
Small performance improvements
2021-04-05 13:16:31 +02:00
TheBusyBiscuit
bbd41ff70c
[CI skip] Fixed 24k carat gold ingot
2021-04-03 19:42:14 +02:00
TheBusyBiscuit
1955d1235b
[CI skip] Refactoring
2021-04-03 19:40:54 +02:00
TheBusyBiscuit
89b8b76fce
[CI skip] Refactoring... I said
2021-04-03 15:20:45 +02:00
TheBusyBiscuit
cb05563014
[CI skip] Refactoring
...
+ Removed unused class
2021-04-03 15:20:08 +02:00
TheBusyBiscuit
18139bb5c4
Fixed Grappling Hook vanishing in creative mode
2021-04-03 14:08:21 +02:00
TheBusyBiscuit
5e87df873c
Fixes #2926
2021-04-03 14:01:48 +02:00
RobotHanzo
dcf411032e
Fixes
2021-04-03 19:25:22 +08:00
RobotHanzo
d428375132
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/UnbreakingAlgorithm.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-03 19:21:52 +08:00
RobotHanzo
a268088d59
Even more advanced enum
2021-04-03 19:13:12 +08:00
RobotHanzo
c56713ed7d
Now using enum
2021-04-03 16:07:41 +08:00
RobotHanzo
11fded46db
Overridable durability RNG
2021-04-02 22:16:25 +08:00
RobotHanzo
f9201b648a
Unused imp.
2021-04-02 21:48:44 +08:00
RobotHanzo
53b38e51be
Fix mistakes
2021-04-02 21:11:42 +08:00
RobotHanzo
a000c92d93
Null checks
2021-04-02 20:50:28 +08:00
RobotHanzo
1bc51f4d80
Fixes #2837
2021-04-02 17:40:00 +08:00
TheBusyBiscuit
ee8d421189
Ancient Pedestals can now be found under "Magical Gadgets"
2021-03-31 19:13:21 +02:00
TheBusyBiscuit
ca3715a0dc
Added Crafting Motor (crafting ingredient for Auto-Crafters)
...
Also retextured the Cargo Motor
2021-03-31 19:02:34 +02:00
TheBusyBiscuit
816cc0613b
Added "Slimeballs -> Slime Block" recipe to Electric Press
2021-03-31 18:31:59 +02:00
TheBusyBiscuit
61f0fa5d0d
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-03-31 18:30:04 +02:00
TheBusyBiscuit
32c60ad5ac
[CI skip] Refactoring
2021-03-31 18:29:43 +02:00
TheBusyBiscuit
0ee724e1e5
Merge pull request #2919 from GallowsDove/master
...
Fixed damageable items not respecting `unbreakable` tag
2021-03-31 17:20:50 +02:00
J3fftw
567b5397cf
Update src/main/resources/languages/messages_en.yml
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-03-31 15:36:19 +02:00
Jeffrey Kosse
5649f95174
Added a new message to multiblocks to see if inventory is empty
2021-03-31 14:37:24 +02:00
GallowsDove
ae7c22703e
requested changes
2021-03-29 20:39:55 +02:00
GallowsDove
062adb4cb7
Hopefully improved code
2021-03-28 22:49:45 +02:00
GallowsDove
7536f01145
Added unbreakable support for damageable items
2021-03-28 22:33:04 +02:00
TheBusyBiscuit
82366191b0
Merge pull request #2916 from Slimefun/fix/issue-2650
...
Fixed 2650
2021-03-28 15:03:58 +02:00
Daniel Walsh
526c2cc76c
Update src/main/resources/languages/researches_en.yml
2021-03-28 13:56:50 +01:00
Sfiguz7
7d92fe45b6
Gitlost I'm coming
2021-03-28 14:54:54 +02:00
Sfiguz7
25fd2120dc
FUCK YOU
2021-03-28 14:53:15 +02:00
Sfiguz7
07c0e88bec
Fuck the research_en file
2021-03-28 14:50:14 +02:00
TheBusyBiscuit
fb8c2ede7f
Merge branch 'master' into fix/issue-2650
2021-03-28 14:47:47 +02:00
Sfiguz7
78d1a8b21a
More merge conflicts
2021-03-28 14:45:03 +02:00
Sfiguz7
7ee4b98745
Resolved merge conflicts
2021-03-28 14:43:57 +02:00
Daniel Walsh
ec37fb142a
Requested changes
2021-03-28 13:26:57 +01:00
TheBusyBiscuit
9e2867870f
Added missing recipe
2021-03-28 14:22:19 +02:00
TheBusyBiscuit
95a2d9e385
Fixed Multimeter not working on Auto-Crafters
2021-03-28 14:18:43 +02:00
TheBusyBiscuit
2cf3ede10b
Fixed some concurrency issues
2021-03-28 11:44:47 +02:00
Daniel Walsh
5283f02903
Fixes #2650
2021-03-28 03:16:50 +01:00
TheBusyBiscuit
0dc1ac3894
Added Produce Collector to automate Milk and Mushroom Stew
...
Also fixed Auto Crafters not handling milk buckets properly
And allowed Block Placers to place down cakes
2021-03-28 01:40:19 +01:00
Daniel Walsh
cb2052ec93
Fixes #2914
2021-03-27 22:52:14 +00:00
TheBusyBiscuit
b64be98274
Added Unit Tests for disabling recipes
2021-03-27 22:34:23 +01:00
TheBusyBiscuit
fd16306b61
Auto-Crafters can now be turned on and off via the gui
2021-03-27 22:26:15 +01:00
TheBusyBiscuit
235d3f4d57
Added Auto-Crafter for the Armor Forge
2021-03-27 18:58:31 +01:00
TheBusyBiscuit
70db23bdc5
Fixes #2913
2021-03-27 18:36:30 +01:00
Daniel Walsh
f7352895ae
Merge pull request #2909 from RobotHanzo/master
...
Fixes #2903
2021-03-27 17:14:40 +00:00
RobotHanzo
a7ee828209
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-03-28 00:47:20 +08:00
TheBusyBiscuit
6eb5235cf7
Automated Crafting Chamber is now disabled.
2021-03-27 11:55:00 +01:00
TheBusyBiscuit
090a0f7791
Merge branch 'chore/cleanup-deprecated-crafter'
2021-03-27 11:52:54 +01:00
TheBusyBiscuit
ba984728e7
Added "Netherite Ingot -> Netherite Block" recipe to Electric Press
2021-03-26 20:58:22 +01:00
TheBusyBiscuit
dba628f99c
[CI skip] Small performance optimization
2021-03-26 20:56:15 +01:00
RobotHanzo
50aaa08ccc
Update Crucible.java
2021-03-27 00:36:20 +08:00
RobotHanzo
af4d3a180e
Fixes #2903
2021-03-26 21:43:21 +08:00
Sfiguz7
5b5a2452a6
Small research cost balancing
2021-03-25 21:21:46 +01:00
Sfiguz7
b515fdbf1b
Filled researches.en, added capitalisation
2021-03-25 21:19:28 +01:00
Sfiguz7
12422a9da4
Misc research too
2021-03-25 21:08:35 +01:00
Sfiguz7
59c3f676e5
Added 2 missing researches
2021-03-25 20:57:28 +01:00
TheBusyBiscuit
f4bded9491
Added "Smart-Filling" mode to Cargo Input Nodes
2021-03-25 18:39:07 +01:00
TheBusyBiscuit
cc421e7e33
Fixes #2906
2021-03-25 13:59:57 +01:00
TheBusyBiscuit
4e719dacc3
[CI skip] Fixed javadocs
2021-03-24 23:17:08 +01:00
TheBusyBiscuit
2535295455
Auto Crafters now work on Barrels, Trapped Chests and Shulker boxes
2021-03-24 23:16:07 +01:00
TheBusyBiscuit
26c7dddbf4
[CI skip] Relocated AutoCrafters
2021-03-24 23:08:06 +01:00
TheBusyBiscuit
1a8d2bfe18
[CI skip] Merge pull request #2900 from Seggan/master
...
Fixed a Message
2021-03-22 22:37:31 +01:00
TheBusyBiscuit
ced7b5a697
[CI skip] Added more documentation
2021-03-22 19:49:00 +01:00
TheBusyBiscuit
02f7135805
[CI skip] Removed an unused class
2021-03-22 19:44:37 +01:00
TheBusyBiscuit
e3171b37dc
Merge branch 'chore/cleanup-deprecated-crafter'
2021-03-22 19:20:18 +01:00
TheBusyBiscuit
ef5d5140ee
[CI skip] Code cleanup
2021-03-22 19:19:53 +01:00
TheBusyBiscuit
e277732608
Fixes #2899
2021-03-22 15:43:20 +01:00
TheBusyBiscuit
c47f56ce47
Merge branch 'master' into api/machine-operations
2021-03-22 15:16:48 +01:00
Seggan
c1090b0fc8
Do changes
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-03-22 09:46:35 -04:00
Seggan
44eb7e7ebe
Fixed message
2021-03-22 09:20:46 -04:00
Daniel Walsh
f6d4d20090
[CI Skip] Merge pull request #2898 from svr333/AutoCrafterFollowUp
2021-03-22 12:35:55 +00:00
svr333
01a0bb7be1
Remove unnecessary spaces
2021-03-22 11:00:04 +01:00
svr333
a83cfcd5cc
Recommended changes
2021-03-22 10:58:55 +01:00
TheBusyBiscuit
0e238497d9
Improved error handling
2021-03-22 10:28:35 +01:00
TheBusyBiscuit
328f9d3331
[CI skip] Automated Crafting Chambers will no longer work.
2021-03-22 10:23:54 +01:00
TheBusyBiscuit
13355c1afe
Fixes #2896
2021-03-22 10:04:57 +01:00
svr333
cda38b13ec
Remove Whiteline
2021-03-22 01:46:24 +01:00
svr333
4067969229
More specific error messages
2021-03-22 01:45:38 +01:00
svr333
92b7c6118a
Be a maid
2021-03-22 01:41:11 +01:00
TheBusyBiscuit
001e7654aa
Fixed #2895
2021-03-21 20:06:46 +01:00
TheBusyBiscuit
0803529176
Merge pull request #2807 from Slimefun/feature/auto-crafters
...
Added Vanilla Auto-Crafter and Enhanced Auto-Crafter
2021-03-21 18:44:42 +01:00
TheBusyBiscuit
9aa3acde02
Merge branch 'master' into api/machine-operations
2021-03-21 15:31:50 +01:00
TheBusyBiscuit
068c121dae
[CI skip] Little cleanup and fixed javadocs
2021-03-21 10:31:37 +01:00
Daniel Walsh
b9a9793134
Merge pull request #2756 from StarWishsama/enchant-level-limit
2021-03-21 03:45:24 +00:00
TheBusyBiscuit
07572eb848
Merge pull request #2888 from NCBPFluffyBear/blockbreakhandler-fix
...
Allow onBlockBreak to be cancelled by BlockBreakHandler
2021-03-19 16:17:17 +01:00
TheBusyBiscuit
fbdf7acc50
Update src/main/resources/languages/messages_en.yml
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-03-19 15:49:52 +01:00
TheBusyBiscuit
6620f85433
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java
...
Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
2021-03-19 15:27:48 +01:00
TheBusyBiscuit
9f0e8ba6ed
[CI skip] Fixed javadocs
2021-03-19 14:47:43 +01:00
TheBusyBiscuit
c12229b25f
Removed deprecated hologram class
2021-03-19 13:05:34 +01:00
TheBusyBiscuit
8161b9ee6d
Fixed Enhanced Furnace not dropping any items when broken
2021-03-19 00:39:41 +01:00
TheBusyBiscuit
44dbb34d9a
Fixed #2887
2021-03-19 00:39:24 +01:00
NCBPFluffyBear
6fef1c8e67
Allow onBlockBreak to be cancelled by BlockBreakHandler
2021-03-17 14:09:22 -05:00
TheBusyBiscuit
a4521a2dd1
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-03-17 11:02:16 +01:00
TheBusyBiscuit
320ee27b3d
Merge branch 'master' into feature/auto-crafters
2021-03-17 10:54:37 +01:00
TheBusyBiscuit
714df364a6
Merge pull request #2866 from Mooy1/master
...
Fix addon blockmenu loading with custom worlds
2021-03-17 10:54:03 +01:00
Name1ess
22f6503184
fix: grammar error
...
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-03-16 09:16:09 +08:00
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