1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Commit Graph

132 Commits

Author SHA1 Message Date
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