mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
5,313 Commits 1 Branch 0 Tags 64 MiB
c84200d2c4
Commit Graph

5313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
c67cc2fbaf
Merge pull request #683 from mrcoffee1026/master 
Resolving the Ancient Altar dupe glitch.
 2018-05-05 19:28:42 +02:00
Rick
80e1a489c8 Fixes repaired/reinforced spawner in guide. 2018-05-05 09:20:10 -04:00
KyleEstein
07134165d6 Implement changes requested by TheBusyBiscuit 2018-05-04 21:41:24 -04:00
Rick
0d3fa24290 changing again to ampersands... 2018-05-04 14:44:09 -04:00
Rick
cc5e7c6e13 Stops constant calls to getByItem() for empty book stacks. 2018-05-03 23:21:14 -04:00
Rick
e3bbf4b442 Fixes Repaired Spawner in the guide... no idea why that's true. 2018-05-03 20:52:32 -04:00
Rick
41da2c4402 put e back from texture address... don't know why that vanished. 2018-05-03 18:50:23 -04:00
Rick
391e897911 Trying again to refix the UTF-8 characters (I guess they changed the file type too, changed it to UTF-8 to fix this from happening again) 2018-05-03 17:20:05 -04:00
Rick
e8f3c62e02 Removes non UTF-8 chars from Programmable Android (Miner) which broke it. 2018-05-03 14:48:25 -04:00
Rick
4cde9413ba Adds checks for and adds to altarinuse. 2018-05-03 14:47:44 -04:00
Rick
5d830fca94 Removes altar and pedistals from altarinuse when finish()-ed. May fix dupe on break during craft (abort()). 2018-05-03 14:47:12 -04:00
Rick
d036d297c0 Adding alterinuse variable 2018-05-03 14:45:38 -04:00
Rick
a65fe55a43 altarinuse addition 2018-05-03 14:41:11 -04:00
TheBusyBiscuit
183a34a99c
Merge pull request #674 from VoidAngel/master 
Updated saw mill protection check
 2018-05-03 10:49:21 +02:00
VoidAngel
b3b2ec5978 Fixes a bug where mobs could pick up altar probe items 2018-04-30 18:00:37 -07:00
VoidAngel
f8112ccb37 Prevent SF items from being used in brewing stands 2018-04-30 17:58:04 -07: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
f9ab6492ee Merge remote-tracking branch 'upstream/master' 2018-04-29 10:27:40 -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
TheBusyBiscuit
9270b08d25
Merge pull request #667 from KyleEstein/Issue412 
Fix Two Player Device Inventory Item Duplication Bug
 2018-04-28 22:41:16 +02:00
KyleEstein
692904ffc3 Missed updating one onBreak() in AFarm.java 2018-04-28 12:14:17 -04:00
KyleEstein
a876301d94 Cast inventory to a variable instead of calling getInventory() over and over 2018-04-28 12:05:43 -04:00
KyleEstein
b16b936b81 Fix Additional Devices Vulnerable to Duplication Bug 2018-04-25 23:40:46 -04:00
KyleEstein
66176b445a Merge branch 'master' of github.com:KyleEstein/Slimefun4 2018-04-25 19:36:37 -04:00
TheBusyBiscuit
dbdfa3cdb7
Merge pull request #662 from Redemption198/master 
Added CS-CoreLib permission check for Slimefun Machines
 2018-04-26 00:04:15 +02:00
TheBusyBiscuit
5cf4f0bbeb
Updated to CS-CoreLib 1.5.18 2018-04-26 00:01:51 +02:00
TheBusyBiscuit
499b540621
Merge pull request #664 from VoidAngel/master 
Guide dupe fix
 2018-04-26 00:01:11 +02:00
VoidAngel
5f8328c02c Removed unintended code 2018-04-25 10:45:54 -07:00
VoidAngel
2506437339 Revert "Fix for players getting stuck in elevator books/teleporter guis" 
This reverts commit f595cb06a8.
 2018-04-25 08:52:31 -07: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
VoidAngel
6482f317b2 Merge remote-tracking branch 'upstream/master' 2018-04-24 21:31:19 -07:00
VoidAngel
f91c319c49 Fixes SF Guide dupe glitch and accidental item loss bug 
This patch makes the menu slots unclickable in all Guide menus.
 2018-04-24 21:30:41 -07:00
VoidAngel
846d0b41d3 Revert "Slimefun book GUI dupe fix" 
This reverts commit 19f4666235.
 2018-04-24 20:43:24 -07:00
TheBusyBiscuit
af9a09e2c9
Merge pull request #659 from mrcoffee1026/master 
Anvil / Broken Spawner patch, Further Fix for keep-inv flags, Soulbound Backpack Recipe fix
 2018-04-24 11:24:29 +02:00
Rick
4acd3645dd Reverts change to isItem, makes changes instead to getByItem 2018-04-23 20:34:53 -04: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
Kyle Einstein
e2342c38eb Fix Two Player Duplication Bug 2018-04-23 08:33:29 -04:00
Rick
1f88557e4c Removing all changes. 2018-04-22 12:48:19 -04:00
Rick
444cb1538e Removing all changes. 2018-04-22 12:48:00 -04:00
Rick
91587048c3 removes case for getbyitem... since i can't check items in the loop here, I can't check the actual item, so this just throws an error and doesn't work anyway. 2018-04-22 12:47:22 -04:00
Rick
47d95af0a0 Fix whitespace issue. 2018-04-22 12:12:52 -04:00
Rick
e6199e3d46 Moves special case out of loop 2018-04-22 12:11:51 -04:00
Rick
3b5669dbaf Fixing some character issue from prior pull requests. 2018-04-22 12:00:23 -04:00
Rick
8e3d2e332b redoing this to fix a thing. 2018-04-22 11:59:53 -04:00
Rick
c65d8cf49b Redoing this to fix a thing. 2018-04-22 11:59:36 -04:00
Rick
2b9e24b45b Commit 1 of 2 for ticket #643 -- eliminates Altar dupe bug by disallowing all interactions while altar is in use. 2018-04-22 10:58:57 -04:00
Rick
34150791bc Commit 2 of 2 for ticket #643 -- eliminates Altar dupe bug by disallowing all interactions while altar is in use. 2018-04-22 10:58:36 -04:00