868 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	0ae0768c29	Fixes #1043	2019-08-26 22:01:40 +02:00
TheBusyBiscuit	7aff9a7fe4	Fixes #1042	2019-08-26 19:13:56 +02:00
TheBusyBiscuit	65975ae094	Refactored Code	2019-08-26 09:07:02 +02:00
TheBusyBiscuit	c08674d8c7	Fixes #1040	2019-08-26 09:04:25 +02:00
TheBusyBiscuit	effca277ba	Merge pull request #1039 from dniym/ElectricFurnace ... Fix electric furnaces not being able to use logs.	2019-08-25 23:30:56 +02:00
dNiym	1859aef846	Fix electric furnaces not being able to use logs.	2019-08-25 17:24:51 -04:00
TheBusyBiscuit	9ac8fca7f4	Added Placeholders	2019-08-25 23:20:31 +02:00
TheBusyBiscuit	cbb1143456	Forgot to push this file	2019-08-25 23:14:06 +02:00
TheBusyBiscuit	ce3055a069	Fixed Infused Magnet working in Spectator Mode	2019-08-25 22:57:41 +02:00
TheBusyBiscuit	cdb43b15ee	Added PlayerProfile#getTitle()	2019-08-25 22:39:59 +02:00
TheBusyBiscuit	8b55a4cd26	More Refactoring	2019-08-25 22:21:06 +02:00
TheBusyBiscuit	a1193781cb	Reduced technical debt	2019-08-25 22:09:27 +02:00
TheBusyBiscuit	0925be3427	Deprecations	2019-08-25 22:01:22 +02:00
TheBusyBiscuit	d99c9ea584	First steps towards PlaceholderAPI hook	2019-08-25 21:41:47 +02:00
TheBusyBiscuit	79c1120ae8	Refactoring, Bug Fix and Cleanup	2019-08-25 20:52:38 +02:00
TheBusyBiscuit	f3c3552e9c	Fixes #1036	2019-08-25 20:23:06 +02:00
TheBusyBiscuit	b10db8c728	Improved error-reports diagnostics	2019-08-25 18:06:36 +02:00
TheBusyBiscuit	2a3b446d15	Improved Backpacks Performance	2019-08-25 17:35:19 +02:00
TheBusyBiscuit	d589002430	Added Research-Caching (May improve Performance a lot)	2019-08-25 16:07:06 +02:00
TheBusyBiscuit	0fad51e263	Fixes #1034	2019-08-24 20:27:25 +02:00
dNiym	b82d9571b7	Fix busted spawners	2019-08-24 00:26:37 -04:00
TheBusyBiscuit	db1e69a94b	Fixed Talisman of the Anvil (Fixes #800)	2019-08-23 21:15:47 +02:00
TheBusyBiscuit	6575e1c538	Merge pull request #1029 from dniym/SpawnerFix ... Fix broken spawner error	2019-08-23 09:07:55 +02:00
dNiym	da8def9d4f	Fix broken spawner error	2019-08-23 01:29:51 -04:00
TheBusyBiscuit	6de21b553b	Merge pull request #1026 from dniym/ReactorAccessFix3 ... Fixed Reactor Access Port being unable to be opened	2019-08-22 21:51:56 +02:00
TheBusyBiscuit	26efc7ad1e	Fixes #1020	2019-08-22 21:37:09 +02:00
dNiym	17f65e26c7	Removed BlockStorageTag that was not needed.	2019-08-22 12:20:19 -04:00
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
dNiym	b5475f3d3c	Made Requested Changes	2019-08-21 21:43:12 -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
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
Nathan Adhitya	e1190a5d1e	Update ItemListener.java	2019-07-08 17:07:38 +07:00
SoSeDiK	839c263955	Replace SimpleJSON with Gson	2019-06-23 23:03:20 +03: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
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