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

1411 Commits

Author SHA1 Message Date
HSGamer
5746285881 EXPLOSIVE_PICKAXE: ignore liquid block 2019-08-04 08:38:58 +07:00
CyberPatriot
657b0e167b Implement Miner Android fix 2019-08-03 17:42:27 -05:00
CyberPatriot
13e0e02dc1 Implement fix for ChestTerminals
Recently,  there was a duplication glitch with Chest Terminals with androids that I had posted. This fix fixes that glitch and prevents androids from mining player heads altogether.
2019-08-03 16:24:34 -05:00
CyberPatriot
c9bdac1277
Merge pull request #1 from TheBusyBiscuit/master
t
2019-08-03 16:17:18 -05:00
TheBusyBiscuit
80aecd2711
Merge pull request #989 from NihilistBrew/spawnerdupe
Fix spawner dupe and objectified e.getBock()
2019-08-03 20:33:41 +02:00
NihilistBrew
b6a4322de6
Fix PR: Remove block storage clear 2019-08-03 20:16:19 +02:00
dniym
33a9a066a3
Merge pull request #2 from TheBusyBiscuit/master
update to base
2019-08-03 14:14:41 -04:00
TheBusyBiscuit
eec510d32f
Merge pull request #979 from dniym/TableSaw
Table saw
2019-08-03 20:06:05 +02:00
TheBusyBiscuit
98bfa98701
Merge pull request #988 from dniym/AltarExploitFix
Fix Altar Item Swap Exploit
2019-08-03 19:53:33 +02:00
dNiym
e62a3d8509 Combined research for Table_Saw and Saw_Mill 2019-08-03 13:51:34 -04:00
dNiym
969fbf01a7 Added Requested Changes 2019-08-03 13:47:36 -04:00
dNiym
751cc88321 Re-Added SAW_MILL to research 2019-08-03 13:44:42 -04:00
dniym
0c4c25f31f
Merge pull request #1 from TheBusyBiscuit/master
update to sf
2019-08-03 13:39:06 -04:00
TheBusyBiscuit
c46d120df8
Merge pull request #991 from dniym/CargoNodeBugFix
Fix issue #966 (Trying again)
2019-08-03 19:37:34 +02:00
dNiym
640915d85a Fix issue #966 (Trying again) 2019-08-03 13:27:46 -04:00
TheBusyBiscuit
233c61e1d6
Merge pull request #990 from dniym/BioReactorFuelUpdate
Adding new 1.14 materials to BioReactor
2019-08-03 19:27:24 +02:00
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