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

665 Commits

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