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
1,182 Commits 1 Branch 0 Tags 64 MiB
e78e749e94
Commit Graph

910 Commits

Author SHA1 Message Date
TheBusyBiscuit
6213c62f47
Merge pull request #866 from SoSeDiK/deprecations 
Replaced deprecated code
 2019-03-29 22:32:50 +01:00
TheBusyBiscuit
7eb074daaa
Merge pull request #869 from SoSeDiK/startup 
Implement createDir() method
 2019-03-27 23:33:37 +01:00
SoSeDiK
56a3941f2f Updated method 2019-03-28 00:31:32 +02:00
TheBusyBiscuit
00b99072e7
Merge pull request #868 from SoSeDiK/guide 
Don't reset guide history when using cheat mode
 2019-03-27 23:25:32 +01:00
SoSeDiK
8a1cb8dad9 Replace deprecated code 2019-03-27 22:48:34 +02:00
SoSeDiK
2c62cae68e Implemented createDir() method 2019-03-27 22:46:04 +02:00
SoSeDiK
4e7f6bfa47 Replace deprecated code 2019-03-27 22:41:29 +02:00
SoSeDiK
eeb51fde41 Don't reset guide history when using cheat mode 2019-03-27 22:38:53 +02:00
SoSeDiK
81e18514ef Use ExoticGarden format for drinks 2019-03-27 22:31:48 +02:00
TheBusyBiscuit
7a0a98bb6d
Merge pull request #863 from SoSeDiK/furnace 
Update FurnaceListener.java
 2019-03-27 21:21:00 +01:00
SoSeDiK
75cbff530c Replaced spaces with tabs 2019-03-27 22:18:59 +02:00
SoSeDiK
c8965e120f Replaced deprecated code parts 2019-03-27 22:10:19 +02:00
SoSeDiK
9e9e36e5c2 Replaced Durability with Damageable meta 2019-03-27 22:09:04 +02:00
TheBusyBiscuit
4fad8aa82c
Merge pull request #864 from SoSeDiK/sneaking 
Prevent opening inventory while sneaking with an item
 2019-03-27 21:08:52 +01:00
SoSeDiK
3c385770e1 Optimized researching progress 2019-03-27 21:38:30 +02:00
SoSeDiK
80642eeed1 Replaced deprecated enchantments code 2019-03-27 21:34:20 +02:00
SoSeDiK
76d00f9a34 Optimized error logging 2019-03-27 21:31:51 +02:00
SoSeDiK
bb35ab3d82 Remove juice one tick faster 2019-03-27 21:07:33 +02:00
SoSeDiK
5915e0dff4 Prevent opening inventory while sneaking with an item 
Vanilla behaviour.
 2019-03-27 21:07:13 +02:00
SoSeDiK
fbf01b1c39 Update FurnaceListener.java 2019-03-27 20:58:47 +02:00
SoSeDiK
2337004c17 Update FurnaceListener.java 2019-03-27 20:51:23 +02:00
SoSeDiK
da16fee28b Update FurnaceListener.java 2019-03-27 20:45:45 +02:00
SoSeDiK
38bcb6b731 Update FurnaceListener.java 2019-03-27 20:25:50 +02:00
TheBusyBiscuit
02ee0f1ce4
Merge pull request #859 from SoSeDiK/androids 
Androids
 2019-03-27 16:55:28 +01:00
TheBusyBiscuit
8c2746e775
Merge pull request #860 from SoSeDiK/spawners 
Spawners
 2019-03-27 16:40:44 +01:00
TheBusyBiscuit
3d3d6ab554
Merge pull request #858 from SoSeDiK/cp 
Updated CoreProtect API
 2019-03-27 16:37:13 +01:00
SoSeDiK
0561cf9e05 Optimized code 2019-03-26 22:56:40 +02:00
SoSeDiK
cb9f1b40f7 Fixed Block Place & Break Handlers not being fired for blocks 
Needed for blocks like REPAIRED_SPAWNER whick can't be written using "SlimefunItem.blockhandler".
 2019-03-26 22:52:27 +02:00
SoSeDiK
ad462d1b50 Added BlockBreakHandler for REPAIRED_SPAWNER 2019-03-26 22:51:04 +02:00
SoSeDiK
00019ef5ce Update ProgrammableAndroid.java 2019-03-26 22:32:25 +02:00
SoSeDiK
63ec77fcbc Fixed Androids movement 
Fixed moving forward actually being backwards (texture bug?)
 2019-03-26 22:26:27 +02:00
SoSeDiK
d85a51ed87 Allow Androids movement in CAVE_AIR 2019-03-26 22:24:50 +02:00
SoSeDiK
c4b096434c Updated CoreProtect API 2019-03-26 22:17:33 +02:00
SoSeDiK
99ad2d4ddf Updated WorldEdit API 2019-03-26 22:03:43 +02:00
SoSeDiK
f5670dddf1 Added a missing tab complete 
& Replaced deprecated method in SlimefunCommand
 2019-02-24 02:10:04 +02:00
SoSeDiK
ef868eae31 Removed unused imports 2019-02-23 23:14:01 +02:00
SoSeDiK
0728523ab7 Keep Waterlogged BlockData 
Glass panes now keep their Waterlogged BlockData
 2019-02-23 22:59:12 +02:00
SoSeDiK
ad2ebaddc9 Fix for #825 
Fixed the issue #825
 2019-02-23 22:45:06 +02:00
SoSeDiK
fab821742d Updated deprecated code parts 
Also replaced spaces with tabs.
 2019-02-23 22:21:03 +02:00
SoSeDiK
c762dc8461 Updated skull rotation handling 
Replaced deprecated methods.
Changed Ageable import.
Androids can be placed in any rotation from the beginning now.
 2019-02-23 22:05:30 +02:00
TheBusyBiscuit
02674e2463
Merge pull request #841 from PrzemoVi/master 
Fixed particles, some bugs.
 2019-02-20 12:55:47 +01:00
TheBusyBiscuit
02613cd577
Merge pull request #837 from TSEngineer/master 
Fix org.bukkit.Color is not imported
 2019-02-20 12:46:03 +01:00
TheBusyBiscuit
b99a75f7a7 Removed Apache Lang 2019-02-20 12:20:44 +01:00
PrzemoVi
5c29f9c8d4
Merge branch 'master' into master 2019-02-08 18:05:48 +01:00
Steve
a91b6253aa
Import Color 2019-02-03 12:45:26 +03:00
Steve
c62c3246ff
Fix particles 2019-01-26 16:21:27 +03:00
BuildTools
e950b264d8 Replaced some deprecated methods. 2019-01-18 20:38:02 +01:00
BuildTools
d88eaf9674 Fixed network particles, pom.xml, some other bugs. 2019-01-17 00:27:39 +01:00
TheBusyBiscuit
5f246ed523 Fixed WorldEdit support 2018-12-30 00:34:27 +01:00
TheBusyBiscuit
c74b14140e
Merge pull request #814 from PrzemoVi/master 
WorldEdit 7.0 support, Ancient Altar fix.
 2018-12-29 21:02:17 +01:00
PrzemoVi
9da3370edf
Fixed itemstack fixing ;) 2018-12-11 18:48:28 +01:00
PrzemoVi
af59dfa5ea
Add files via upload 
WorldEdit 7.0 fix
 2018-12-06 22:17:26 +01:00
Sniddunc
b83f64a0a7 Fixed a Furnace bug where the item did not smelt and the GUI repeated off the screen. 2018-11-24 03:39:20 -05:00
Sniddunc
442a92c247 Fixed a Furnace bug where the item did not smelt and the GUI repeated off the screen. 2018-11-24 03:24:31 -05:00
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
188818061c Fixed Bronze Ingot being a brick block. 2018-09-18 10:52:50 +02:00
TheBusyBiscuit
464f15bf97 Nerfed Juices 2018-09-06 13:03:51 +02: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
TheBusyBiscuit
d56c872be2 Removed AdvancedRainbowTicker 2018-09-05 18:37:23 +02:00
TheBusyBiscuit
e592b0dc1e Removed deprecated code from Machines 2018-09-05 18:36:32 +02:00
MisterErwin
c0e51f2458 Code cleanup + MaterialHelper 2018-09-05 18:26:58 +02:00
MisterErwin
4632d2f55b Fixed RainbowTicker not updating glass pane facings 2018-09-05 18:11:42 +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
MisterErwin
81a0509b70 Added 1.13 Material for CharCoal to the Carbonpress 2018-09-05 18:10:01 +02:00
MisterErwin
f6e6ef0cdf Using 1.13 Materials and BlockData for farming 2018-09-05 17:52:40 +02:00
MisterErwin
81031d3acc Using spigot Particles and BlockData Directional 2018-09-05 17:51:38 +02:00
MisterErwin
1a7e094657 Using the BlockData to drop correctly 2018-09-05 17:51:13 +02:00
MisterErwin
ef74d04125 Using 1.13 Skull Materials and Entity Types 2018-09-05 17:50:48 +02:00
MisterErwin
2d9afec1a4 Using BlockData Directional for onBlockDispensing 2018-09-05 17:50:15 +02:00
MisterErwin
acb4d0a922 Added the new Leaves & "clay"/terracotta to the ECrucible 2018-09-05 17:49:47 +02:00
MisterErwin
171e244a80 Using 1.13 Materials for CargoNodes (and the MaterialHook for the channel colour) 2018-09-05 17:49:14 +02:00
MisterErwin
da9b93b32e Using 1.13 Materials and Particles for Machines 2018-09-05 17:44:03 +02:00
MisterErwin
860a2dfe09 Using 1.13 Materials for Machines 2018-09-05 17:43:36 +02:00
MisterErwin
9ab28ad47c Using 1.13 Materials for Machines 2018-09-05 17:43:06 +02:00
MisterErwin
d46aaad34c Using 1.13 Materials 2018-09-05 17:42:34 +02:00
MisterErwin
18c62bca95 Using 1.13 Materials 2018-09-05 17:41:08 +02:00
MisterErwin
7a6dc71f1b Removed unnötiges ToDo 2018-09-05 17:40:26 +02:00
MisterErwin
40bf16390f Added RainbowTicker 2018-09-05 17:40:11 +02:00
MisterErwin
9f8b728249 Added 1.13 logs 2018-09-05 17:39:51 +02:00
MisterErwin
3f588e92ba Disabled the AdvancedRainbowTicker - is this one still needed? 2018-09-05 11:41:54 +02:00
MisterErwin
f18aa30631 Using vanilla/spigot particles 2018-09-05 11:30:49 +02:00
MisterErwin
d5aa03ca28 Using vanilla/spigot particles 2018-09-05 11:30:22 +02:00
MisterErwin
812fd1e271 Updated to 1.13 biomes 2018-09-05 11:30:01 +02:00
MisterErwin
aafbdc7512 Added api-version to plugin.yml 2018-09-05 11:23:17 +02:00
TheBusyBiscuit
93039c7cc3 First steps towards 1.13.1 port. 2018-09-04 11:33:57 +02:00
TheBusyBiscuit
b7385d1fc1
Merge pull request #751 from creator3/master 
Hopefully reduce input node breakage
 2018-08-06 21:17:46 +02:00
TheBusyBiscuit
1c649a4537
Merge branch 'master' into master 2018-08-06 21:13:46 +02:00
TheBusyBiscuit
79ef1c73dc
Merge pull request #733 from Ajptlink/Ajptlink-patch-1 
Fixed issue #686
 2018-08-06 21:12:18 +02:00
TheBusyBiscuit
934f46a03f
Merge pull request #730 from Firebuggie/master 
Fixes Butcher Androids being able to loot Wither Skeleton Skulls again.
 2018-08-06 21:02:47 +02:00
creator3
338621670b Hopefully reduce input node breakage 2018-07-31 15:55:18 -04: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
Ajptlink
391845fe86
Update RitualAnimation.java 2018-07-09 16:41:22 +02:00
Firebuggie
bf643cf02e
Update AndroidKillingListener.java 2018-07-04 20:48:58 +02:00
TheBusyBiscuit
69e1654985
Merge pull request #724 from AtomicScience/master 
Fix issue #690
 2018-06-23 14:05:03 +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
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
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
340fc046d0
Fixed Reactor Overflows 2018-05-11 13:11:13 +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
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
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
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
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
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
Rick
fda8f56f8a Switched to "continue" as stated. Although... pondering as to why this would have seemed to have worked anyway... the way I did it, in the case of a match, the whole thing quits... which is actually fine if the user just died in a keep-inventory region. If there was a better way of determining the existence of a keep-inventory region from all plugins that might produce one, really, that's what we'd rather be checking for here anyway. This is a fine alternative, but actually identical items will result in only one being kept when dying in a non-keep-inventory situation. 2018-04-22 10:25:44 -04:00
Rick
83e55c255d Changed to special cases only for solving issue with Broken/Repaired spawner renaming ability. There may still be other items these routines don't define as "SlimeFun items" without identical lore to the example, but hopefully this covers everything. 2018-04-22 10:19:57 -04: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
785cbea08f I could not use "breaK" as advised as that would completely break the loop and cease checking for duplicates among the remaining items. However, we are only checking against 5 additional slots here, so I've stated them each and made them return if a match is a bit better than setting a variable and all that, this is also more clear about what is going on here. I will state that the previous patch does introduce a limitation: identical soulbound items would be lost. Having exactly duplicated soulbound items prior to a death is a rather extreme situation, but during my testing I actually was using some I duplicated in creative mode and noticed that I would only retrieve one of each, and not the copies. It might be desireable to integrate an option here to only use this logic IF keep inventory regions will be in use somewhere, although not entirely necessary. 2018-04-20 17:53:36 -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
Rick
6e1376cfb2 Fix for the Anvil being able to rename Broken and Reinforced Spawners resulting in becoming vanilla pig spawners. Problem with isDisabled... called isItem... which doesn't return an affirmative unless the lore matches exactly... however... lore would nearly never match exactly: backpacks have different ids or no ids, no item ever matches to "<type>" or "<id>" which should result in a great number of slimefun items being identified as NOT SlimeFun items. 2018-04-20 17:43:57 -04:00
VoidAngel
f595cb06a8 Fix for players getting stuck in elevator books/teleporter guis 2018-04-19 14:11:23 -07:00
VoidAngel
19f4666235 Slimefun book GUI dupe fix 
Adds a player to a List when they have the guide open and cancels all inventory clicks until the menu is closed.
 2018-04-17 23:35:33 -07:00
SoSeDiK
c8ab30a485
Removed changes 
Move RecipeType to the ExoticGarden
 2018-04-17 00:47:05 +03:00
SoSeDiK
3edba533c9
Added a new Category for ExoticGarden 2018-04-16 23:39:06 +03:00
SoSeDiK
b423c9bd87
Replaced deprecated method 2018-04-16 19:46:18 +03:00
SoSeDiK
111424bae4
Replaced deprecated method 2018-04-16 19:45:09 +03:00
SoSeDiK
eb7388c613
Replaced deprecated method 2018-04-16 19:43:03 +03:00
SoSeDiK
2f7d4b619b
Replaced deprecated method 2018-04-16 19:41:50 +03:00
SoSeDiK
41b6cd389d
Added holidays prefixes 2018-04-16 19:11:50 +03:00
SoSeDiK
44e696c19c
Added holidays prefixes 2018-04-15 19:55:18 +03:00
SoSeDiK
5a3978691f
Added holidays prefixes 2018-04-15 19:53:11 +03:00
SoSeDiK
1482218f84
Added holidays prefixes 2018-04-15 19:29:03 +03:00
SoSeDiK
86429da311
Oops... Forgot about the import. 2018-04-15 19:23:23 +03:00
SoSeDiK
eabd074f05
Fixed & in title messages 2018-04-15 19:18:43 +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
SoSeDiK
410a901bfd
Fixed mistake 2018-04-10 01:51:06 +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
TheBusyBiscuit
3d90994d9f
Merge pull request #632 from meiamsome/fix-509 
Check if the chunk is loaded instead of relying on exceptions
 2018-03-25 10:11:50 +02:00
Oliver Wright
eaa93df83e
Move Block storage to be based on Locations. 2018-03-10 19:22:12 +00: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
d21f93239b
AReactor fix & a fix for chargable energy sources 2018-03-10 15:32:16 +00:00
Oliver Wright
2c0dc15e4c
Create a Network class to manage networks in a stateful way 2018-03-10 01:05:15 +00:00
Oliver Wright
5aef1c1a25
Prevent Talisman of the Hunter from duping armour/heads 2018-03-05 19:15:38 +00:00
TheBusyBiscuit
b3e5e45b2c
Merge pull request #623 from AtomicScience/master 
Fixed incompatibility with KeepItems-like plugins
 2018-03-03 17:42:43 +01:00
AtomicScience
fb07f1bb32
Fixed incompatibility with KeepInventory 2018-03-03 18:47:54 +03:00
TheBusyBiscuit
ef51932e31
Merge pull request #619 from meiamsome/electric-dust-washer 
Fix #617: Electric Dust Washer - Dust Choice.
 2018-03-02 22:51:36 +01:00
TheBusyBiscuit
25539be913
Merge pull request #620 from meiamsome/error-file-creation-fix 
Simplify error file name generation
 2018-03-02 22:45:10 +01:00
Oliver Wright
7278f80c6f
Fix #617: Electric Dust Washer - Dust Choice. 2018-03-02 20:17:44 +00:00
Oliver Wright
273499a230
Simplify error file name generation 2018-03-02 20:03:11 +00:00
Oliver Wright
63e5245b2c
Simplify the RitualAnimation 2018-03-02 19:40:45 +00:00
VoidAngel
1e5d7e0d2d
Fix discrepancies between block storage data and server events 
1) Stop falling blocks from falling into a spot where an SF machine was just mined. Typically the blockstorage does not update fast enough, causing machine duplication. The event is cancelled, and the falling entities drop as items instead of disappearing.

2) Nearly the same as above, but with pistons pushing solid blocks into air blocks which had a slimefun machine in it a moment prior. Typically the blockstorage does not update fast enough, causing machine duplication.
 2018-02-21 09:50:59 -08:00
TheBusyBiscuit
c33c8e065e
Merge pull request #597 from Meta-Win/master 
Fix #575
 2018-02-20 23:47:06 +01:00
VoidAngel
2bec58d361
Fix for #532 - Limited disenchanter dupe glitch 2018-02-20 14:14:56 -08:00
Meta-Win
948c6a650b
Fix Conflict Names 2018-02-15 14:25:55 -02:00
Meta-Win
79cd64361a
Fix Conflict Names 2018-02-15 14:25:14 -02: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
7fefb0ea15
Merge pull request #573 from AtomicScience/master 
Fixed Cooler rejecting Juices
 2018-01-10 12:30:58 +01:00
AtomicScience
5c688177f8
Some tiny changes in onClick() 2018-01-08 22:33:47 +03:00
TheBusyBiscuit
0a6f54ec8d
Merge pull request #569 from Poslovitch/documentation 
Documentation fixes and improvements
 2018-01-07 20:48:12 +01:00
TheBusyBiscuit
1d0660db53
Merge pull request #570 from Redemption198/master 
Fixed Android Miner not breaking Slimefun blocks correctly
 2018-01-07 20:29:14 +01:00
AtomicScience
44e8b103f9
Fixed Cooler rejecting juices 2018-01-07 17:33:57 +03:00
Redemption
24e070b7a8
Moved BlockStorage.check() inside the methods 2018-01-07 12:52:28 +01:00
Redemption
7b9687f79d
Added blockhandler check before breaking sf blocks 2018-01-07 01:26:38 +01:00
Redemption
17cc989012
Documented #retrieve() 
Credits: @Poslovitch
 2018-01-06 16:13:16 +01:00
Redemption
9f0796327b
Fixed Android Miner not breaking Slimefun blocks correctly 2018-01-06 15:53:23 +01:00
Florian CUNY
16af68b289 Simplified CategorySorter#compare() 2018-01-06 15:28:02 +01:00
Florian CUNY
f2a74bb46c Improved documentation in Category and Alloy 2018-01-06 15:26:01 +01:00
Florian CUNY
7851f33b57 Fixed @since tags for 4f0aeed504 2018-01-06 15:03:28 +01:00
TheBusyBiscuit
bb22ceab5b
Merge pull request #567 from John000708/master 
Fixed speed modifier not getting applied to Enhanced Furnaces
 2018-01-06 12:54:31 +01:00
TheBusyBiscuit
9a948b705a
Merge pull request #560 from Poslovitch/preparing-new-guide-layout 
Preparing new guide layout
 2018-01-06 12:53:07 +01:00
John000708
3e232c00d8 Tiny typo fixed 2018-01-06 12:51:16 +01:00
TheBusyBiscuit
4f9c36c8a2
Merge pull request #557 from StarWishsama/master 
correct word in Files.java
 2018-01-06 12:49:49 +01:00
John000708
2777ec9407 Small fix 2018-01-06 11:07:54 +01:00
John000708
b6c3021355 Fixed speed modifier not getting applied to Enhanced Furnaces 2018-01-05 18:09:10 +01:00
Redemption
fefd3b1fe5
Removed debug prints 2018-01-03 16:36:40 +01:00
Redemption
ffc9de3f7c
Added ANDROID_DIG as Unregister Reason 2018-01-03 16:26:43 +01:00
Redemption
1b1954d47d
Fixed Android Miner not breaking Slimefun blocks correctly 2018-01-03 16:25:29 +01:00
Florian CUNY
a4dd773cb8 Fixed month of Easter category to April 2018-01-01 21:21:46 +01:00
StarWishsama
4d9b141f23
correct word of Files.java 2017-12-31 09:07:02 +08:00
Florian CUNY
2d66ca38cb Renamed experimental variable to book in SlimefunGuide 2017-12-30 01:31:50 +01:00
TheBusyBiscuit
fb4b3ab738
Fixed Arguments 2017-12-29 12:10:21 +01:00
TheBusyBiscuit
f5d9170961
Fixed Import 2017-12-29 12:01:22 +01:00
TheBusyBiscuit
691c8740d5
Merge pull request #549 from Redemption198/master 
Fixed Pedestal not dropping item when is broken or explodes
 2017-12-29 11:55:59 +01:00
TheBusyBiscuit
f9f4648303
Fixed ChestTerminal Lore 2017-12-29 11:54:23 +01: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
d9f5442351
Reverted 2017-12-28 11:16:14 +01:00
Redemption
349d4f7e90
Fixed pedestal not dropping item when is broken or explodes 2017-12-28 11:11:03 +01:00
Redemption
aa7758467b
Removed option fro dropping item when pedestal explodes. 2017-12-28 11:08:20 +01:00
Redemption
8efcfba90c
Fixed unpickable item staying after pedestal esplosion 
Now if the pedestal explodes the item above it'll be removed, and dropped if requested.
 2017-12-26 16:57:07 +01:00
Redemption
2bb1a059ed
Added an option for ancient pedestals 
Added the option "drop-item-when-ancient-pedestal-explodes" (Default: false).
 2017-12-26 16:52:29 +01:00
Florian CUNY
97bd64474f Wrapped the ID in \" to simplify reading the exception 2017-12-26 15:45:52 +01:00
Florian CUNY
c14aba1e6b Explicitly disallow registering two SFItems with same ID 2017-12-26 15:44:18 +01:00
Redemption
bc314087d1
Reverted to single message 2017-12-26 00:17:57 +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
Redemption
496473f593
Fixed Pedestal not dropping above item. 
Now the pedestal drops the item which is currently above of it when it's broken.
Also when the pedestal is obstructed now it'll warn to remove the block or the fluid which is blocking the pedestal.
 2017-12-25 20:43:23 +01:00
TheBusyBiscuit
4f0aeed504
Merge pull request #544 from Poslovitch/settings-panel 
Improved Settings & Contributors panels
 2017-12-21 15:06:27 +01:00
Florian CUNY
2d38231101 Small performance improvement in CargoManager 
done by saving the blockinfo to avoid heavy calls. Would probably need later a more reliable "rewrite".

Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/514
 2017-12-21 08:22:57 +01:00
Meta-Win
d6a67e3908
Reverted 2017-12-20 17:16:34 -02:00
Meta-Win
c9e04851f9
Add files via upload 2017-12-20 00:45:17 -02:00
Meta-Win
dbe900b39b
Add files via upload 2017-12-20 00:44:53 -02:00
Meta-Win
a257efa98f
Add files via upload 2017-12-20 00:44:22 -02:00
Meta-Win
aeaa912bf2
Add files via upload 2017-12-20 00:43:51 -02:00
Meta-Win
71a0aa8544
Add files via upload 2017-12-20 00:43:15 -02:00
Florian CUNY
be4d91c7ea Added Stars count in Settings panel 2017-12-09 17:04:37 +01:00
Florian CUNY
665521aecb Improved Credits display 
- If the contributer's name is the same than in Minecraft, his head shows up ( 🎆 )
- Contribution is now shown in a more understandable way
 2017-12-09 16:52:13 +01:00
Florian CUNY
d2b4d58e35 Documented and made changes to Contributor 2017-12-09 16:28:45 +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
36ddfbf65f Simplified the pass condition in Talisman 2017-12-09 15:53:44 +01:00
Florian CUNY
6cb081cfd3 Minor changes in Talisman and EnderTalisman 
Renamed consumed field to consumable
Added javadoc : since

Talisman -
Field initialisation inline instead of in constructors
Simplified a condition
 2017-12-09 15:46:50 +01:00
Florian CUNY
858f964b82 Privatized fields in Talisman and EnderTalisman 2017-12-09 15:38:14 +01:00
Florian CUNY
5fb3ec967b Fixed typo in SlimefunSetup 2017-12-09 15:37:53 +01:00
Florian CUNY
9760fc75b1 Moved Miner Talisman listener from ToolListener to TalismanListener 2017-12-09 15:34:36 +01:00
Florian CUNY
24a5613c05 Fixed wrong "since" in ItemPickupListeners' documentation 2017-12-09 15:34:06 +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
Florian CUNY
475eaae0b0 Fixed typo "Slimfun" to "Slimefun" 2017-12-01 19:28:12 +01:00
Florian CUNY
5fba0e37ac Fixes #510 2017-12-01 19:27:50 +01:00
TheBusyBiscuit
7e2fc76b12
Merge pull request #513 from Poslovitch/fix-333 
Fixes juices not restoring hunger - #333 & #87
 2017-12-01 18:00:40 +01:00
Florian CUNY
1763cc61f4
Fixed mishandled check 2017-12-01 17:46:22 +01:00
Florian CUNY
fc20062cd6 Fixed to check version is NOT 1.9 or 1.10 2017-12-01 13:11:05 +01:00
Florian CUNY
8ffb6ffd61 Changed the version check to 1.9 and 1.10 for easier future support 2017-12-01 10:08:31 +01:00
Florian CUNY
35b65139ce Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/333 and https://github.com/TheBusyBiscuit/Slimefun4/issues/87 2017-11-29 21:01:31 +01:00
TheBusyBiscuit
33f27d96c7
Merge pull request #504 from Poslovitch/patch-1 
Fixed Android being able to break command blocks
 2017-11-26 23:22:49 +01:00
TheBusyBiscuit
595ef5f907
Merge pull request #507 from Poslovitch/4.1.12 
4.1.12
 2017-11-26 09:51:07 +01: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
Florian CUNY
e2533d9b75 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/375 2017-11-25 22:07:00 +01:00
Florian CUNY
2696f5a8a5 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/334 2017-11-25 22:05:34 +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
Redemption
229dca3766
Added parameters to EventHandler 2017-11-25 13:31:13 +01:00
Florian CUNY
fd4d678332
Use brackets in loops 2017-11-25 10:31:09 +01:00
Florian CUNY
93f877a2d4 Error reports : prioritized Slimefun Environment (addons, etc) 2017-11-25 10:22:53 +01:00
Florian CUNY
6093b4cf49
Fixed some typo from 05b1fe77a5 2017-11-23 22:23:50 +01:00
Florian CUNY
18017680e8
Fixed some spacing 2017-11-23 22:21:02 +01:00
Florian CUNY
05b1fe77a5
Re-added all the "this." to #register(boolean) 2017-11-23 22:16:45 +01:00
Florian CUNY
c95bafad6a
Fixed #addWikipage(String) link to TheBusyBiscuit 2017-11-23 22:11:32 +01:00
Florian CUNY
b4e85d96e7
Fixed Android being able to break command blocks 2017-11-23 09:16:05 +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
51f23f90c1
Changed cant-place to cannot-place 2017-11-22 21:20:08 +01:00
Redemption
179ad06bbf
Changed cant-place to cannot-place 2017-11-22 21:19:25 +01:00
Poslovitch
2c2bc42540 Changed key "hide-in-recipe-book" to "hide-in-guide" 2017-11-22 20:39:18 +01:00
Poslovitch
502efd862b Revert requirePermissionToUse (not ready yet) 2017-11-22 20:37:30 +01:00
Redemption
0eb52e6627
Removed else return (line 192) 2017-11-22 20:34:57 +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
e57eec9b14
Added onBlockPlace event 
Added onBlockPlace event to prevent block placements (by players) above the pedestals
 2017-11-22 18:36:12 +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
aa600a4ae3
Changed PEDESTAL.obstructed 
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
 2017-11-22 10:31:10 +01:00
Redemption
f4bc3d1f80
Changed pedestal.obstruct 
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
 2017-11-22 10:29:19 +01:00
Redemption
47c13fe9e7
Removed else at line 65 2017-11-21 19:33:05 +01:00