dNiym
4d326f5228
Fixing revert, no idea how that happened.
2019-08-03 13:19:10 -04:00
dNiym
bcbeafba53
made requested changes
2019-08-03 13:05:23 -04:00
NihilistBrew
8af503aceb
Fix spawner dupe and objectified e.getBock()
2019-08-03 18:59:47 +02:00
dNiym
1f3f2c635d
Fix Altar Item Swap Exploit
2019-08-03 12:54:45 -04:00
TheBusyBiscuit
45255a60a6
Merge pull request #982 from NihilistBrew/master
...
Add outputChest functionality
2019-08-03 18:09:18 +02:00
TheBusyBiscuit
862c14c403
Merge branch 'master' into master
2019-08-03 18:08:51 +02:00
TheBusyBiscuit
9afba9fa78
Merge pull request #984 from NihilistBrew/changetowire
...
Add copper wire
2019-08-03 17:54:37 +02:00
NihilistBrew
50d74ced10
Fixed indents
2019-08-03 17:52:10 +02:00
NihilistBrew
8c8996368b
fix PR
2019-08-03 17:39:41 +02:00
TheBusyBiscuit
56cbc67487
Merge pull request #985 from NihilistBrew/sandstone
...
Add sandstone to grind stone
2019-08-03 17:27:33 +02:00
NihilistBrew
460c082a51
Fixed research indent #2
2019-08-03 17:03:54 +02:00
NihilistBrew
5eaf3949b7
Fixed research indent
2019-08-03 17:02:32 +02:00
NihilistBrew
6af9307fe1
Accidentally edited a LOC
2019-08-02 15:04:22 +02:00
NihilistBrew
09b961ad1d
Added sandstone to grind stone
2019-08-02 14:55:07 +02:00
NihilistBrew
78cea97fff
Add copper wires
2019-08-02 13:20:28 +02:00
NihilistBrew
00d376e213
Update SlimefunMachine.java
2019-08-01 12:03:08 +02:00
NihilistBrew
b9d8e8f5dd
Update config.yml
2019-08-01 11:17:47 +02:00
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
