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

5455 Commits

Author SHA1 Message Date
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
BuildTools
01bf454794 Added an option to disable the disenchanting of Slimefun Items. 2016-10-28 19:38:09 +02:00
BuildTools
ba644401f4 Fixed Chiseled Quartz being used for infinite silicon in a smeltery. (Also fixed for any other similar items with different data) 2016-10-28 16:32:23 +02:00
TheBusyBiscuit
ab45623344 Failsafe for Elytras in Anvils (2/2) 2016-10-16 22:08:07 +02:00
TheBusyBiscuit
4daffec161 Failsafe for Elytras in Anvils 2016-10-16 22:03:41 +02:00
TheBusyBiscuit
31c86d47fe Merge pull request #19 from John000708/master
Made elytra enchantable in a normal anvil.
2016-10-16 14:03:29 +02:00
BuildTools
bfe85cdeeb Fix bad encoding.. 2016-10-16 13:58:23 +02:00
BuildTools
c06470d450 Made Elytras enchantable in normal anvils. 2016-10-16 13:44:17 +02:00
mrCookieSlime
6f61176d0c Immense Auto-Saving Optimizations 2016-09-17 10:12:44 +02:00
mrCookieSlime
169539de56 Immense AutoSaving Optimizations 2016-09-17 10:06:21 +02:00
BuildTools
329a191d3c Now you shouldn't be able to fix a broken spawner with any items. 2016-09-11 22:55:39 +02:00
TheBusyBiscuit
9d4ff6df7d Update SlimefunStartup.java 2016-08-21 01:12:26 +02:00
TheBusyBiscuit
339d34313c Delete SlimefunStartup.java 2016-08-21 01:10:51 +02:00
TheBusyBiscuit
285ff5a529 Update README.md 2016-08-20 00:38:06 +02:00
TheBusyBiscuit
705dc16256 Merge pull request #18 from alekso56/master
Change reflection field to work on 1.10 - 1.10.2
2016-08-20 00:29:21 +02:00
alekso56
c8d15ad1cd Change reflection field to work on 1.10 - 1.10.2 2016-08-20 00:24:12 +02:00
TheBusyBiscuit
9401a512b1 Update README.md 2016-08-19 23:01:44 +02:00
TheBusyBiscuit
295cff53d6 Merge pull request #16 from Poslovitch/hazmat-fix
Fixed full hazmat suit necessity
2016-08-19 23:00:58 +02:00