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,178 Commits 1 Branch 0 Tags 64 MiB
3400746c34
Commit Graph

1178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NihilistBrew
60064a0fe1 Added OUTPUT_CHEST functionality 
S
 2019-08-01 11:01:43 +02:00
dniym
1386849d7d
Replace Saw_Mill with Table_Saw machine 
Replaced saw_mill machine with new table_saw machine in the research, to allow players who previously unlocked the saw_mill to craft it's replacement.
 2019-07-30 12:53:03 -04:00
dniym
6db2e48e64
Add Table_Saw to the SlimeFunItems List 2019-07-30 12:50:36 -04:00
dniym
bd4732281b
Set SAW_MILL to be hidden in the slimefun guide 2019-07-30 12:49:04 -04:00
dniym
d0fa9a53fd
Added a new basic machine to replace the Saw Mill 
Sawmill was obsolete and could not be easily reworked to allow for new minecraft logs.
 2019-07-30 12:43:17 -04:00
TheBusyBiscuit
bf61b4a42f Added GitHubBuilds-Updater for development-builds 2019-07-17 14:57:52 +02:00
TheBusyBiscuit
6389a57017
Merge pull request #957 from NathanAdhitya/master 
Fix for #953, add Slimefun books to anvil and grindstone blacklist.
 2019-07-08 19:31:00 +02:00
Nathan Adhitya
e1190a5d1e
Update ItemListener.java 2019-07-08 17:07:38 +07:00
TheBusyBiscuit
4fe466c212
Merge pull request #951 from sarhatabaot/patch-1 
Added maven source plugin
 2019-06-27 20:14:02 +02:00
Omer Oreg
5bd6d614e4
Added maven source plugin 
* This allows the viewing of the sources from within an IDE when building against Slimefun.
 2019-06-27 13:19:32 +03:00
TheBusyBiscuit
64fca6edb1
Merge pull request #950 from SoSeDiK/loader 
Replace SimpleJSON with Gson
 2019-06-23 22:21:05 +02:00
SoSeDiK
839c263955 Replace SimpleJSON with Gson 2019-06-23 23:03:20 +03:00
TheBusyBiscuit
8f173ea76c
Merge pull request #944 from BluGhostYT/master 
Switch boolean allow = true; to false
 2019-06-21 15:22:51 +02:00
CyberPatriot
f9ee475dca Push 2019-06-20 18:12:23 -05:00
CyberPatriot
ebd1275f89
Change boolean allow = true to false 
The reason for this is because it solves a duplication glitch.
 2019-06-20 17:50:03 -05:00
TheBusyBiscuit
2812b84ea8 Minor Code Optimizations 2019-06-20 10:12:34 +02:00
TheBusyBiscuit
7c011d916a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-06-20 09:51:15 +02:00
TheBusyBiscuit
1fd0b40f9f Removed URID 2019-06-20 09:50:59 +02:00
TheBusyBiscuit
5656a0564f
Update AncientAltarListener.java 2019-06-19 22:33:47 +02:00
TheBusyBiscuit
0a5c9e901e
Fixed Ancient Altar Items 2019-06-19 22:32:09 +02:00
TheBusyBiscuit
991c713e3d
Merge pull request #942 from BluGhostYT/master 
Fix hologram locations for energy regulator and cargo manager
 2019-06-19 21:33:52 +02:00
CyberPatriot
2f301be679
Update ReactorHologram.java 2019-06-19 09:26:30 -05:00
CyberPatriot
3e6767cfb3
Update EnergyHologram.java 2019-06-19 08:32:33 -05:00
CyberPatriot
569f9bb329
Fix holograms for Cargo and energy 2019-06-19 08:32:18 -05:00
TheBusyBiscuit
4946d428ad Fixed Item Recognition System 2019-06-19 08:46:43 +02:00
TheBusyBiscuit
27cb4c389c Fixed Ancient Altar Recipes for good 2019-06-18 17:39:59 +02:00
TheBusyBiscuit
b2420b8271 Fixed Ancient Altar Recipes 2019-06-18 15:35:16 +02:00
TheBusyBiscuit
b333cfd7a5 Improved Ancient Altar Recipe Recognition System 2019-06-18 14:55:52 +02:00
TheBusyBiscuit
330f439472
Merge pull request #937 from bverhoeven/block-break-fix 
Drop Slimefun items when broken by another Slimefun tool
 2019-06-13 21:47:49 +02:00
Bas Verhoeven
eba6fb041f Drop Slimefun items when broken by another Slimefun tool 
When a Slimefun item that doesn't have a BlockHandler is broken by a
tool that does have a BlockHandler and that tool's BlockHandler returns
true, Slimefun would stop handling the "onBlockBreak" event and would
not drop the Slimefun item that was broken but some vanilla block
instead.

This commit attempts to fix the way those events are handled, ensuring
that if a Slimefun item is broken one is dropped for the player.
 2019-06-13 21:18:43 +02:00
TheBusyBiscuit
6d7b7253a0
Merge pull request #935 from BluGhostYT/patch-1 
Fix for issue #879
 2019-06-13 08:19:46 +02:00
CyberPatriot
877e01b1be
Fix for issue #879 
This edit is for issue #879 . Tested on latest versions of Slimefun, ChestTerminal, and CS-CoreLib. 1.13 is to be determined.
 2019-06-12 23:48:38 -05:00
TheBusyBiscuit
299dfe6c45
Merge pull request #933 from TheBusyBiscuit/renovate/net.coreprotect-coreprotect-2.x 
Update dependency net.coreprotect:coreprotect to v2.16.3
 2019-06-11 23:18:04 +02:00
TheBusyBiscuit
b398686b1c
Merge pull request #932 from TheBusyBiscuit/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.0.0
 2019-06-11 23:17:53 +02:00
Renovate Bot
057a3a4419
Update dependency net.coreprotect:coreprotect to v2.16.3 2019-06-11 19:59:53 +00:00
Renovate Bot
814b89af56
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.0.0 2019-06-11 19:59:22 +00:00
TheBusyBiscuit
7bf46a6cb5
Update renovate.json 2019-06-11 21:58:58 +02:00
TheBusyBiscuit
8506777955
Merge pull request #931 from TheBusyBiscuit/renovate/configure 
Configure Renovate
 2019-06-11 21:53:12 +02:00
Renovate Bot
41cc400da3
Add renovate.json 2019-06-11 19:51:55 +00:00
TheBusyBiscuit
78cbc990f4 Fixes #912 2019-06-11 13:27:24 +02:00
TheBusyBiscuit
1c600efee3 Possibly fixes #822 2019-06-11 12:45:50 +02:00
TheBusyBiscuit
eba0753b10
Merge pull request #930 from STEngineer/master 
Add PrepareItemCraftEvent listener
 2019-06-10 21:12:23 +02:00
Steve
3900cb7aff
Update ItemListener.java 2019-06-10 22:32:31 +04:00
Steve
302062c01f
Merge pull request #1 from TheBusyBiscuit/master 
Update from upstream
 2019-06-10 22:31:25 +04:00
TheBusyBiscuit
2821939027 Updated CS-CoreLib 2019-06-09 10:02:47 +02:00
TheBusyBiscuit
63ecc1fbfb
Merge pull request #922 from bverhoeven/explosive-pick-damage 
Damage explosive pickaxe on use (configurable, off by default)
 2019-06-02 10:23:11 +02:00
Bas Verhoeven
7b2a869abe Damage explosive pickaxe on use (configurable, off by default) 
The Explosive Pickaxe currently doesn't take any damage and therefore
doesn't lose durability, which isn't a desirable behavior for some of
us.

This commit adds a 'damage-on-use' item setting for EXPLOSIVE_PICKAXE,
which is disabled by default. When enabled, the Explosive Pickaxe will
get damaged for each block it breaks, in the same way a normal Diamond
Pickaxe would get damage if it were to break those blocks. This seems
to be similar to how Slimefun damages other tools.

Players can still enable Unbreaking (e.g. durability) on the pickaxe.
 2019-05-30 21:07:36 +02:00
TheBusyBiscuit
7dae7766e2
Merge pull request #921 from bverhoeven/inventory-overflow 
Fix for guide bug when building Bio Reactor (and maybe others)
 2019-05-30 20:33:23 +02:00
Bas Verhoeven
0af6ec13d6 Do not allow more than 54 items in reactor/generator setup guide slots 
If we don't, opening the schematics for a Bio Reactor results in

"IllegalArgumentException: Size for custom inventory must be a multiple
 of 9 between 9 and 54 slots"

And the player is simply handed the Bio Reactor, which they can place
and use. Once they do that, the Slimefun guide can't be used until they
reconnect.

For generators and reactors we show the fuels underneath the schematics
or build instructions. When there are more fuels than available space to
show them, we'll overflow, causing the custom inventory to not work and
Slimefun throwing exceptions.
 2019-05-30 20:08:35 +02:00
TheBusyBiscuit
3010e93675 Fixes #895 2019-05-30 13:50:20 +02:00