1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

201 Commits

Author SHA1 Message Date
Sniddunc
092d79dda7 Fixed Sawmill Bug where only 1 item was dropped 2018-11-24 01:19:24 -05:00
VoidAngel
2ae249dec4
Fixes lumber axe dupe #797 2018-11-09 12:54:01 -08:00
TheBusyBiscuit
bd0c1949ba Minor changes 2018-09-06 12:50:49 +02:00
TheBusyBiscuit
58ead59419 Added missing 1.13 stuff 2018-09-05 21:02:57 +02:00
MisterErwin
55c3d6f711 Re-Added isItemSimiliar for ALWAYS 2018-09-05 18:11:32 +02:00
MisterErwin
60b08ac917 Got rid of "is Similar" - as mc 1.13 now used a Material for every Item
This one is WIP as all the colours & wood & stone types have to be re-added.
Please also take a look
2018-09-05 18:11:21 +02:00
MisterErwin
83f3fb4c4b Fied charcoal 1.13 material 2018-09-05 18:10:21 +02:00
DrOreo002
9d3ca22b1f Some code cleanup and fix grappling hook dupe 2018-07-15 13:02:45 +07:00
VoidAngel
ae83e65871
Fix misplaced parentheses for digital miners
Fixes issue #734
2018-07-09 17:55:32 -07:00
AtomicScience
a25bb15c93
Fix #690 2018-06-23 14:51:48 +03:00
SoSeDiK
c0f959f211 Added two additional recipes
Allowed using acacia and dark oak logs for crafting the walking sticks.
2018-06-06 12:53:28 +03:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +03:00
VoidAngel
24f09bc87a Fixes soulbound backpack craft crafting
Also a few more .clones() were added as a precaution for the future.
2018-05-21 12:38:42 -07:00
TheBusyBiscuit
803c19a27e
Removed BlockBreaker 2018-05-21 20:51:12 +02:00
TheBusyBiscuit
439818fb0e
Merge pull request #673 from KyleEstein/legacy_washers
Allow admins to chose ore washer and dust washer behavior
2018-05-05 19:38:29 +02:00
VoidAngel
9d1ad3c866 Removed redundant code 2018-04-29 11:15:07 -07:00
VoidAngel
e0fd8a358e Fixed the protection check location 2018-04-29 10:37:11 -07:00
VoidAngel
fc601bda6b Updated saw mill block check
The saw mill will now only use the CS-CoreLib protection manager. Also Ive added a check to prevent people from duping planks using barrels.
2018-04-29 10:27:30 -07:00
KyleEstein
17ec56799a Allow admins to chose ore washer and dust washer behavior 2018-04-28 20:13:37 -04:00
Redemption
3a0d73ae9c
Added CS-CoreLib permission check for Slimefun Machines
Removed the horrible whitespaces and updated the code to the last commit.
2018-04-25 11:18:49 +02:00
TheBusyBiscuit
827bc3c370
Merge branch 'master' into master 2018-04-25 10:13:47 +02:00
Redemption
0e7597e06f
Added CS-CoreLib permission check for Slimefun Machines
Added CS-CoreLib permission check for Slimefun Machines.
Updated some deprecated methods.
2018-04-23 22:33:08 +02:00
Rick
fd9ed5155a cleaned up some whitespace that showed up in last commit. 2018-04-21 17:28:43 -04:00
Rick
201fb33eb4 Closes #631... player no longer needs to be "owner" of the item to break these two blocks. This makes sense to me since most Slimefun blocks do not check for this either except maybe those which have inventories, which neither of these do. 2018-04-21 17:20:43 -04:00
Rick
44e9a3cc43 Copies entirety of logic from the Enhanced Crafting table to the Magic Workbench for the crafting of Soulbound Backpacks. On further investigation, I discovered this did not "delete" the ID of the backpack being used for crafting, but instead recycles that ID for use in the final crafted pack and simply adjusts the size for that ID so that it matches. By taking that approach, I was forced to include all of this even though this will make it exponentially more difficult to make ID-less packs for sale in other plugins like ChestShop. 2018-04-20 17:47:41 -04:00
SoSeDiK
41b6cd389d
Added holidays prefixes 2018-04-16 19:11:50 +03:00
SoSeDiK
5a3978691f
Added holidays prefixes 2018-04-15 19:53:11 +03:00
SoSeDiK
86429da311
Oops... Forgot about the import. 2018-04-15 19:23:23 +03:00
SoSeDiK
42ae9103e5
Replace deprecated method 2018-04-10 02:12:25 +03:00
SoSeDiK
9f2d91a20c
Allow using different log types 2018-04-10 02:04:43 +03:00
SoSeDiK
f328300941
Food Fix For Creative Mode 2018-04-10 01:57:35 +03:00
SoSeDiK
9b64804461
Update SlimefunSetup.java 2018-04-10 01:53:16 +03:00
SoSeDiK
5267cdb82b
Fixed mistake 2018-04-10 01:52:24 +03:00
TheBusyBiscuit
7b07bc8c61
Merge pull request #630 from meiamsome/network-caching
Create a Network class to manage networks in a stateful way
2018-03-25 10:19:07 +02:00
Oliver Wright
f30c61fcfc
Check if the chunk is loaded instead of relying on exceptions 2018-03-10 19:08:18 +00:00
Oliver Wright
2c0dc15e4c
Create a Network class to manage networks in a stateful way 2018-03-10 01:05:15 +00:00
Meta-Win
e7e195a43e
Fix Conflict Names 2018-02-15 14:24:27 -02:00
Dylan Xaldin
16899eb96a Fix Reinforced Spawners being a Pig Spawner when placed. 2018-02-07 19:06:06 -06:00
TheBusyBiscuit
4f9c36c8a2
Merge pull request #557 from StarWishsama/master
correct word in Files.java
2018-01-06 12:49:49 +01:00
StarWishsama
4d9b141f23
correct word of Files.java 2017-12-31 09:07:02 +08:00
Redemption
2a80104402
Removed useless checks 2017-12-28 23:15:09 +01:00
Redemption
815557c29e
Update SlimefunSetup.java 2017-12-28 11:44:54 +01:00
Redemption
349d4f7e90
Fixed pedestal not dropping item when is broken or explodes 2017-12-28 11:11:03 +01:00
Redemption
f9a6225793
Reverted to single message for obstructed pedestral. 2017-12-26 00:15:29 +01:00
Redemption
12ec120d48
Split pedestal obstructed message.
Now there are two messages for the obstructed pedestal, one for blocks and one for liquids.
2017-12-25 20:45:44 +01:00
Florian CUNY
cd741d19d5 Fix NPE on BlockBreakEvent with Smelter's Pickaxe
as well as optimizing it a bit.

Fixes #367
2017-12-09 15:54:22 +01:00
Florian CUNY
5fb3ec967b Fixed typo in SlimefunSetup 2017-12-09 15:37:53 +01:00
TheBusyBiscuit
a93a5e88d6
Fixed Christmas Cake Recipe 2017-12-02 21:38:16 +01:00
Meta-Win
c3d3685420
Fix Christmas Cookie and Chocolate Milk Recipes 2017-12-02 17:39:34 -02:00
TheBusyBiscuit
fe4ec68a35
Merge pull request #502 from Poslovitch/slimefunitem-improvements
SlimefunItem : renames of some methods, made ghost configurable, changed "name" to "id" and privatized all fields
2017-11-26 09:50:41 +01:00
TheBusyBiscuit
3bbd0e040c
Merge pull request #500 from Redemption198/master
Fixed ancient pedestal bug #499
2017-11-25 17:34:01 +01:00
TheBusyBiscuit
fc5be2778d
Merge pull request #503 from AtomicScience/ore_washer_fix
Ore washer dupe fix
2017-11-25 17:33:18 +01:00
AtomicScience
cc9c07ad60 Fix "Ore Washer Dupe" 2017-11-23 00:09:44 +03:00
AtomicScience
bda7a18c5b Fix "Ore Washer Fix" 2017-11-23 00:00:33 +03:00
Redemption
3fcfadb189
Update Messages.java 2017-11-22 21:21:39 +01:00
Redemption
179ad06bbf
Changed cant-place to cannot-place 2017-11-22 21:19:25 +01:00
Redemption
9ad714601b
Update Messages.java 2017-11-22 18:41:27 +01:00
Redemption
a0edb57464
Merge branch 'master' into master 2017-11-22 18:39:35 +01:00
Redemption
1749ae4131
Added messages.cant-place 2017-11-22 18:34:42 +01:00
Poslovitch
26c13b375e Explosive pickaxe could break BARRIER, and COMMAND blocks 2017-11-22 17:36:28 +01:00
Redemption
f4bc3d1f80
Changed pedestal.obstruct
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
2017-11-22 10:29:19 +01:00
Redemption
cb7a8a3949
Added PEDESTAL.obstucted message 2017-11-21 19:27:31 +01:00
TheBusyBiscuit
fc58f9163d
Merge pull request #494 from AtomicScience/master
New Slimefun block - Automatic Ignition Chamber
2017-11-21 18:26:20 +01:00
AtomicScience
afb341acff
"resf" renamed to "chamber" 2017-11-21 11:25:06 +03:00
AtomicScience
cb5f146840
Code optimization 2017-11-20 17:59:20 +03:00
AtomicScience
89b1da7db8 Changed the way of detect the Chamber 2017-11-20 15:48:52 +03:00
AtomicScience
b61bd7c3ef
Updated "machines.ignition-chamber-no-flint" 2017-11-20 15:12:09 +03:00
Redemption
cb354cd6eb
Added "commands.open_guide" description 2017-11-18 17:43:25 +01:00
atom
9645b8db81 Revert "Added few more types of Jerky food - all vanilla types of meat and also fish. Removed 'Saturation' effects and changed types of Jerky food"
This reverts commit 534ea6b14f.
2017-11-15 21:45:52 +03:00
atom
534ea6b14f Added few more types of Jerky food - all vanilla types of meat and also
fish. Removed 'Saturation' effects and changed types of Jerky food
2017-11-15 21:28:38 +03:00
AtomicScience
6605ac9fe3
Fix issue #319 2017-11-15 20:56:04 +03:00
AtomicScience
d9ef5bab02
Fix issue #319 2017-11-15 20:52:30 +03:00
AtomicScience
d8655437c8
Added a research for Ignition Chamber 2017-11-15 19:23:22 +03:00
AtomicScience
3786ad327b
Fix some probelms 2017-11-15 15:24:18 +03:00
AtomicScience
ff9d0a08cf
Add files via upload 2017-11-15 14:36:30 +03:00
Florian CUNY
cc79e62f34 Made use of the renamed methods 2017-10-13 16:34:38 +02:00
David Kirchner
f278abc76a Only create a hopper "target" as long as the block is actually a hopper.
This fixes a bug that led to abandoned ArmorStands (what I was referring
to when I said "target") that lingered after the hopper was destroyed.
The issue was that tick (called asynchronously) was creating a new
ArmorStand (via InfusedHopper.getArmorStand()) after the block handler's
onBreak call removed the one that was created in onPlace.

The code that recreates the ArmorStand remains in tick() just in case,
somehow, it ends up getting removed by some other force. However, this
code should never be reached if the hopper itself is removed.

This fixes TheBusyBiscuit/Slimefun4#189,
fixes TheBusyBiscuit/Slimefun4#190, and
fixes TheBusyBiscuit/Slimefun4#428.
2017-10-05 19:49:33 -07:00
Poslovitch
c34673ac14 Blockstates must be explicitly updated as of 1.12.1
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/391
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/395
2017-08-20 18:37:09 +02:00
Poslovitch
4aac192776 Crafting a Water Ancient Rune now gives 4 instead of 2 2017-08-17 13:08:59 +02:00
Poslovitch
6eecee0eae Documented WikiSetup 2017-08-14 18:16:09 +02:00
Poslovitch
00ef07b0bb Added a research for blistering ingots 2017-08-12 15:18:05 +02:00
Poslovitch
bc53533ca4 Documented and improved Researches 2017-06-23 13:06:08 +02:00
Poslovitch
cddaf1c1a6 Little color fixes in messages 2017-06-22 14:20:31 +02:00
Poslovitch
b3ec105ddc Removed unused import & modified messages 2017-06-19 15:58:32 +02:00
Poslovitch
9d4f6879ea Added an optional amount parameter for /sf give
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/300
Also removed a useless online check, and adapted messages (may need the
owners to regenerate messages.yml file)
2017-06-19 14:51:32 +02:00
John000708
5d3c7b643e 1.12 Support 2017-06-13 19:28:54 +02:00
AlexLander123
4a23613277 Added unplaceable-blocks for BlockPlacer 2017-05-30 17:14:11 +08:00
TheBusyBiscuit
9ae4baab44 Extend Backpack Fixes to Cooler 2017-05-02 15:38:20 +02:00
VoidAngel
1c04e66b65 Fixed typo 2017-04-25 09:16:25 -07:00
VoidAngel
41d462b265 Update SlimefunSetup.java 2017-04-25 08:21:15 -07:00
VoidAngel
8ecdec0491 Crucible fix
Fix for the hardened_clay crucible recipe and prevent block place on use
2017-04-24 10:43:12 -07:00
VoidAngel
c5f110dca4 Added backpack already open message 2017-04-21 10:01:38 -07:00
DeathlyPanda
5d8b0e4ddb Simplified Patch 2017-04-14 18:25:02 -04:00
DeathlyPanda
52d42a5744 Fix Pickaxe of Vein Mining Dupe
Fixed pickaxe to prevent duplication of ores.
2017-04-13 09:42:07 -04:00
TheBusyBiscuit
1962dbb0a5 Chain Armor no longer spams messages 2017-04-09 09:59:45 +02:00
TheBusyBiscuit
f751eafc86 Fixed Jet Boots Recipe 2017-04-09 09:46:05 +02:00
TheBusyBiscuit
10d87d37b3 Fixed Backpack Crafting 2017-04-08 19:19:29 +02:00
TheBusyBiscuit
8ebae91e36 You can now upgrade Backpacks 2017-04-08 19:13:06 +02:00
Mason
552af5d9cd Added Trash Can 2017-03-15 05:53:34 -04:00
Mason
b67a50b2d1 Added Cargo Management 2017-03-15 05:50:00 -04:00