8372 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
BuildTools	b31229deaa	Added Electrified Crucibles	2016-11-26 12:54:32 +01:00
BuildTools	9f3bd4caf2	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2016-11-26 12:49:54 +01:00
BuildTools	8fc62d4a30	Minor tweaks	2016-11-26 12:41:20 +01:00
mrCookieSlime	d5b9c98704	Added new Tiers of Electric Smelteries and Electrified Crucibles	2016-11-26 12:37:43 +01:00
mrCookieSlime	1f4993e3cf	Minor changes	2016-11-24 18:10:54 +01:00
mrCookieSlime	f25ed67aa1	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4.git	2016-11-24 17:58:34 +01:00
TheBusyBiscuit	4beb645a2a	Merge pull request #32 from John000708/master ... Conversion from § to &, refined the Reactor	2016-11-24 17:54:26 +01:00
BuildTools	2822791596	Farmer Android was missing...?	2016-11-24 17:48:11 +01:00
BuildTools	7f5b60778b	Merge remote-tracking branch 'origin/master'	2016-11-24 17:37:01 +01:00
BuildTools	ef748fe01e	Added Electric Crucible	2016-11-24 17:36:46 +01:00
BuildTools	7aa493a96d	Replaced all § with &	2016-11-23 19:12:47 +01:00
BuildTools	6f8ef1acfe	Replaced all § with &	2016-11-23 19:08:54 +01:00
BuildTools	3e470d87fb	Replaced all § with &	2016-11-23 16:51:57 +01:00
TheBusyBiscuit	8e94d37254	Merge pull request #31 from John000708/master ... Refined reactor when no cooling is required	2016-11-21 19:18:45 +01:00
BuildTools	f0e81533aa	Refined reactor when no cooling is required	2016-11-21 19:01:34 +01:00
John000708	833b3d6837	Merge pull request #30 from John000708/master ... Fixed ReactorHologram	2016-11-20 22:28:52 +01:00
BuildTools	87bddc1fd8	Fixed ReactorHologram	2016-11-20 22:27:52 +01:00
mrCookieSlime	1b674aed05	Minor Changes to the Nether Star Reactor	2016-11-20 21:40:05 +01:00
mrCookieSlime	60635d6475	Added Coolant Hologram	2016-11-20 21:35:24 +01:00
TheBusyBiscuit	a915f2cd88	Merge pull request #29 from John000708/master ... Forgot to add this...	2016-11-20 21:20:42 +01:00
BuildTools	4e46d46b75	Forgot to add this...	2016-11-20 21:18:04 +01:00
TheBusyBiscuit	da55fea551	Merge pull request #28 from John000708/master ... Made Reactor abstract	2016-11-20 21:11:47 +01:00
BuildTools	269e10d2ff	Added Nether Start Reactor.	2016-11-20 21:06:13 +01:00
BuildTools	b7c760649e	Made the Nuclear Reactor abstract, which will allow developers to make their own reactors.	2016-11-20 17:50:20 +01:00
TheBusyBiscuit	e7deb8032c	Merge pull request #27 from John000708/master ... 1.11 Support	2016-11-20 15:07:18 +01:00
BuildTools	bce1a3dfa3	1.11 Support	2016-11-20 14:47:46 +01:00
TheBusyBiscuit	eb52630355	Merge pull request #25 from John000708/master ... Added Advanced Farmer Android	2016-11-20 00:59:03 +01:00
BuildTools	6b08a18f1f	Added Advanced Farmer Android - Allows the harvest of Exotic Garden plants.	2016-11-20 00:23:37 +01:00
John000708	7fb81c8d3c	Merge pull request #24 from John000708/master ... Bracket was missing (No idea how the IDE did not pick this up...)	2016-11-13 19:30:10 +01:00
BuildTools	7e1238fe83	Bracket was missing (No idea how the IDE did not pick this up...)	2016-11-13 19:29:04 +01:00
TheBusyBiscuit	75b53b4d06	Merge pull request #23 from John000708/master ... Added 1 new item, fixed some stuff	2016-11-13 18:42:22 +01:00
BuildTools	62aa6e034a	Prevent minecart from picking up display item	2016-11-13 18:36:22 +01:00
BuildTools	06e1424db1	Merge remote-tracking branch 'upstream/master' ... Conflicts: src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java	2016-11-13 18:28:21 +01:00
BuildTools	b1b8dd5107	Fixed NMS	2016-11-13 18:16:02 +01:00
TheBusyBiscuit	24774ec878	Fixed Import	2016-11-13 18:13:44 +01:00
BuildTools	edbf5234f0	Added the Ingot Pulverizer to the researches	2016-11-13 17:45:05 +01:00
BuildTools	1b4cf5f9c3	Added Ingot Pulverizer.	2016-11-13 17:40:26 +01:00
BuildTools	bdb8bc5d2f	Prevent Hopper Minecarts from picking up display items	2016-11-13 17:36:46 +01:00
TheBusyBiscuit	13f208a3b6	Fixed Ancient Altar Dupe Bug	2016-11-13 09:39:13 +01:00
TheBusyBiscuit	dbb3847645	Merge pull request #22 from John000708/master ... Update Version	2016-11-06 11:31:41 +01:00
BuildTools	c99a1fd9a7	Update Version	2016-11-05 21:34:01 +01:00
TheBusyBiscuit	0c0456003a	Update CSCoreLibLoader.java	2016-10-31 10:09:08 +01:00
mrCookieSlime	aba9353ff2	Fixed Imports + Elytra Failsafe (3)	2016-10-30 11:13:20 +01:00
TheBusyBiscuit	dea3e7fa0d	Fixed Opening Permission for Advanced Cargo Output Node	2016-10-30 11:02:56 +01:00
TheBusyBiscuit	55f192d82e	Permission Update for Cargo Output Nodes	2016-10-30 11:02:16 +01:00
TheBusyBiscuit	4ec9cfda22	Permission Update for Cargo Input Nodes	2016-10-30 11:01:47 +01:00
TheBusyBiscuit	f3d9346619	Cargo Nodes can now be opened by anyone permitted to access Inventories in that Area	2016-10-30 11:01:01 +01:00
TheBusyBiscuit	391f2d9391	Merge pull request #21 from John000708/master ... Make the disenchanting feature individual for each item.	2016-10-28 22:18:46 +02:00
BuildTools	435d236ef1	Make the disenchanting feature individual for each item.	2016-10-28 22:08:40 +02:00
TheBusyBiscuit	abc94186f4	Merge pull request #20 from John000708/master ... Fixed 1 bug and added a new feature.	2016-10-28 19:49:15 +02:00