1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

790 Commits

Author SHA1 Message Date
TheBusyBiscuit
c7ce480a5b
Removed redundant line 2019-08-22 14:56:05 +02:00
TheBusyBiscuit
8527828c70
Merge pull request #1028 from dniym/DroidFix2
Droid fix2
2019-08-22 14:55:31 +02:00
dniym
6766284f11
Fix Unbreakable Androids
Fixes #997
2019-08-21 22:08:54 -04:00
dNiym
deb904f338 adsf 2019-08-21 22:05:38 -04:00
dNiym
778431c306 Fix androids being unbreakable 2019-08-21 22:04:10 -04:00
dNiym
5c68c07cca typo fix 2019-08-21 21:52:36 -04:00
dNiym
2aeefab235 Fix energy regulators when exploded 2019-08-21 21:50:32 -04:00
NihilistBrew
ce1e3fb07c
Fix indents 2019-08-19 20:24:08 +02:00
NihilistBrew
4fd996e2fc Add double-chest backpack (Radiant Backpack) 2019-08-19 20:15:25 +02:00
TheBusyBiscuit
bfba42c3f3
Merge pull request #1016 from dniym/Backpack-Fix-948
Backpack fix 948
2019-08-19 09:53:07 +02:00
TheBusyBiscuit
36377c5777
Merge pull request #1014 from dniym/TableSaw2
Table Saw Bug #1003 fix
2019-08-19 09:45:39 +02:00
TheBusyBiscuit
0a840ccea9
Merge pull request #995 from dniym/ReactorFix
Reactor fix
2019-08-19 09:31:06 +02:00
TheBusyBiscuit
480ee72e08 Fixes #1009 2019-08-19 09:17:40 +02:00
dniym
1625220b7f
Fix issue #948
Fixes issue #948
2019-08-19 01:00:55 -04:00
dNiym
24e9652857 fix Item Duplication Bug #1003
This fix currently prevents stripped_ logs from being used at all in the
table saw as the MaterialHelper.java in CS-Core lib needs to be updated
to allow the wood type to be properly detected from the material name.
Update submitted in cs-corelib ->
https://github.com/TheBusyBiscuit/CS-CoreLib/pull/109
2019-08-19 00:18:09 -04:00
dNiym
2418764806 Use a variable to compare reactor id types. 2019-08-18 23:43:22 -04:00
dNiym
aeacac0b01 Updated with requested changes 2019-08-18 14:47:25 -04:00
AlexLander123
7defa9ccba Fixes ChestedHorse Duplication Bug 2019-08-09 21:29:57 +08:00
dNiym
8a56939931 Made Requested Changes 2019-08-05 09:44:40 -04:00
dNiym
bac456da25 REACTOR/PORT UPDATE
Update Reactor and Reactor Access Port to be a bit easier to use, now
when a reactor detects an attached access port the GUI will be updated
to show the two are linked.  Once linked the reactor access port will
show the status of the actual reactor rather than it's own inventory,
allowing users to remotely control the reactor's priority and see the
remaining fuel/coolant.   Items can still be added to the access port
manually or sent in from the cargo manager.
2019-08-05 01:15:12 -04:00
TheBusyBiscuit
f54fd125c3
Merge pull request #992 from BluGhostYT/master
Duplication glitch fix for ChestTerminals & Androids
2019-08-04 16:48:43 +02:00
HSGamer
8a6cecf7bd SMELTERS_PICKAXE: return true 2019-08-04 21:26:27 +07:00
CyberPatriot
b322e3a207 Update ProgrammableAndroid.java 2019-08-04 09:20:05 -05:00
HSGamer
79e9839c6e SMELTERS_PICKAXE: use hasBlockInfo 2019-08-04 14:46:51 +07:00
CyberPatriot
86a1960ffd Fix #2
So apparently I am a moron and didn't think about making the entire code for it mining all SF items ignored.

Courtesy to dNiym for pointing this out.
2019-08-04 00:47:43 -05:00
HSGamer
e00984816f SMELTERS_PICKAXE: ignore Slimefun block 2019-08-04 08:44:05 +07:00
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
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
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
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
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
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