1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

7233 Commits

Author SHA1 Message Date
TheBusyBiscuit
69e1654985
Merge pull request #724 from AtomicScience/master
Fix issue #690
2018-06-23 14:05:03 +02:00
TheBusyBiscuit
4e15347f6a
Merge pull request #718 from creator3/master
Parse block info at startup
2018-06-23 14:01:08 +02:00
AtomicScience
a25bb15c93
Fix #690 2018-06-23 14:51:48 +03:00
creator3
ae3ba64f54 Parse block info at startup 2018-06-15 19:23:51 -04:00
TheBusyBiscuit
634c306342
Merge pull request #711 from SoSeDiK/Some-additions-and-fixes
Some additions and fixes
2018-06-11 14:46:18 +02: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
a5e38577d2 Fixed colors in the Book GUI 2018-06-06 12:50:26 +03:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +03:00
SoSeDiK
6eb17d1d45 Removed unused imports 2018-06-06 11:46:18 +03:00
Anom Suryadinata
a91481a566
Merge pull request #2 from TheBusyBiscuit/master
Test
2018-06-03 18:55:10 +07:00
TheBusyBiscuit
40cbafa504
Merge pull request #706 from VoidAngel/master
Fixes soulbound backpack crafting
2018-05-21 21:47:21 +02: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
d4a06ceb90
Update README.md 2018-05-21 21:17:32 +02:00
TheBusyBiscuit
919a9710ee
Update README.md 2018-05-21 21:11:01 +02:00
TheBusyBiscuit
e74d8c23d2
Update ISSUE_TEMPLATE.md 2018-05-21 20:58:23 +02:00
TheBusyBiscuit
803c19a27e
Removed BlockBreaker 2018-05-21 20:51:12 +02:00
TheBusyBiscuit
340fc046d0
Fixed Reactor Overflows 2018-05-11 13:11:13 +02:00
Anom Suryadinata
bfac1096a1
Merge pull request #1 from TheBusyBiscuit/master
Updating my fork
2018-05-09 11:09:26 +07:00
The Busy Bot
2ef7fbd575 Updated to Version: v4.1.15 2018-05-05 17:42:27 +00: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
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