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

223 Commits

Author SHA1 Message Date
TheBusyBiscuit
ccf5fd351d // TODO 2017-01-14 22:45:06 +01:00
BuildTools
f822bc961b Solved Conflicts 2017-01-14 22:43:44 +01:00
TheBusyBiscuit
d0462f8f80 Guide Changes 2017-01-14 22:40:06 +01:00
TheBusyBiscuit
1a7af859e5 Merge pull request #94 from NathanAdhitya/master
Minor Fixes
2017-01-08 13:30:19 +01:00
NathanAdhitya
d6a10e1528 Minor Fixes
Derp. Changed the Minecraft Color Code, and added PlayerInventory
update, as suggested by TheBusyBiscuit.
2017-01-08 18:49:55 +07:00
TheBusyBiscuit
6e1c895d56 Merge pull request #92 from NathanAdhitya/master
Off-Hand Monster Jerky Fix
2017-01-08 11:35:05 +01:00
NathanAdhitya
3a79063a71 Off-Hand Monster Jerky Fix
There may be a better way of implementing this, but.... ehh.. this is my
concept :P.

The other lines, are just naughty github not accepting the Color code
symbols.
2017-01-08 08:44:48 +07:00
TheBusyBiscuit
f639c36509 Fixed Ancient Altar dropping invalid ItemStacks when aborting 2017-01-05 13:53:11 +01:00
TheBusyBiscuit
18def9d050 Machine Settings Pre-Setup 2017-01-04 17:48:44 +01:00
NathanAdhitya
7b86df37fc . 2017-01-01 21:07:26 +07:00
NathanAdhitya
a3afb14a10 . 2017-01-01 20:26:50 +07:00
NathanAdhitya
1af833bf96 Tier 2 Electric Ore Grinder Speed and Energy is not at the proper value. 2017-01-01 20:23:53 +07:00
NathanAdhitya
8ff8daf4b5 Tier 2017-01-01 20:08:40 +07:00
Admin
042ce48272 Added NotPlaceable Interface 2016-12-30 10:48:58 +01:00
TheBusyBiscuit
5b990aa4c5 Added NotPlaceable Interface 2016-12-30 10:48:27 +01:00
AlexLander123
c565252072 Implemention of ExcludedTool and ExcludedSoulboundTool
Fix Soulbound Shovel and Soulbound Hoe Duplication Bug;
2016-12-30 10:09:08 +08:00
mrCookieSlime
f102f452fb Fixed AncientAltar Recipe Check 2016-12-28 08:47:36 +01:00
mrCookieSlime
75c2fea04a Fixed Offhand Juice Handling 2016-12-27 14:24:49 +01:00
mrCookieSlime
ee88262243 Fixed JSON Parsing 2016-12-27 12:44:23 +01:00
mrCookieSlime
ef32a361ab Local JSONParser Object 2016-12-26 23:57:56 +01:00
mrCookieSlime
e306232933 Fixed JSON Parsing 2016-12-26 23:56:22 +01:00
mrCookieSlime
a3f118ca21 Escape Chunk JSONs 2016-12-26 23:38:18 +01:00
mrCookieSlime
c95c8c9ae0 Fixed JSON Escaping? 2016-12-26 23:36:19 +01:00
TheBusyBiscuit
da4fd57906 Merge pull request #59 from NathanAdhitya/master
Coal Ore is more reasonable to give 4 coal, rather than two in Advanced Digi-Miner
2016-12-20 15:48:52 +01:00
NathanAdhitya
8743da7c8e Coal Ore is more reasonable to give 4 coal, rather than two in Advanced Digi-Miner 2016-12-20 20:45:02 +07:00
TheBusyBiscuit
8bb0af64bb Merge pull request #56 from NathanAdhitya/master
Cargo Connected Text Color Doesn't work on a few servers.
2016-12-19 18:30:26 +01:00
NathanAdhitya
e4400a5229 Cargo Connected Color Text Doesn't Work on a few servers. 2016-12-19 17:19:21 +07:00
TheBusyBiscuit
9a1ef3282e Revert "Book Mode Color Fix" 2016-12-18 14:49:50 +01:00
NathanAdhitya
39eb79f0c9 Book Mode Color Fix
Looks like tellraw doesn't support the & symbols, eh?
Don't mind the tiny mess I made. There could've been some improvements.
2016-12-18 18:50:45 +07:00
mrCookieSlime
04ce375ea1 Fixed Radioactive Items not radiating in Off-Hand 2016-12-13 16:00:35 +01:00
mrCookieSlime
9c06deddc5 Moved abstract Resources 2016-12-05 19:51:39 +01:00
mrCookieSlime
3e7071561b Added Post Handler Method 2016-12-05 19:41:29 +01:00
mrCookieSlime
c3033bb6b0 API Additions 2016-12-05 19:39:58 +01:00
TheBusyBiscuit
4ad601f90d Merge pull request #40 from John000708/master
Fixed some stuff
2016-12-04 15:18:05 +01:00
BuildTools
daa457d88d Update version 2016-12-04 15:11:31 +01:00
BuildTools
fa0f0a4012 Fixed some stuff 2016-12-04 00:08:59 +01:00
mrCookieSlime
0df97edfcc Changed Electric Ingot Pulverizer Speed 2016-11-28 20:06:37 +01:00
mrCookieSlime
622009d1b3 Minor Tweaks 2016-11-28 19:57:57 +01:00
mrCookieSlime
bcbbe3bbfa Potential Error Fix 2016-11-28 19:49:57 +01:00
BuildTools
5d1cf4d135 Fixed 2 minor issue (Should be the last ones) 2016-11-28 19:18:19 +01:00
BuildTools
b729485157 Removed Deprecated Backpacks 2016-11-27 22:38:33 +01:00
BuildTools
5ccf83c182 Fixed Backpacks 2016-11-27 21:13:48 +01:00
BuildTools
ac97c0435c Added researches
Fixed minor issue
2016-11-27 19:57:36 +01:00
BuildTools
ef9fa6a54b Update Version 2016-11-27 19:34:45 +01:00
mrCookieSlime
174658a4a1 Created abstract Drill 2016-11-26 20:25:36 +01:00
mrCookieSlime
7609ba04fb Added Nether Drill 2016-11-26 13:07:09 +01:00
mrCookieSlime
fe00a62730 Added Nether Ice 2016-11-26 13:03:45 +01:00
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
BuildTools
2822791596 Farmer Android was missing...? 2016-11-24 17:48:11 +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
3e470d87fb Replaced all § with & 2016-11-23 16:51:57 +01:00
BuildTools
f0e81533aa Refined reactor when no cooling is required 2016-11-21 19:01:34 +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
BuildTools
4e46d46b75 Forgot to add this... 2016-11-20 21:18:04 +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
BuildTools
bce1a3dfa3 1.11 Support 2016-11-20 14:47:46 +01:00
BuildTools
6b08a18f1f Added Advanced Farmer Android - Allows the harvest of Exotic Garden plants. 2016-11-20 00:23:37 +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
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
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
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
alekso56
c8d15ad1cd Change reflection field to work on 1.10 - 1.10.2 2016-08-20 00:24:12 +02:00
mrCookieSlime
2c01982a48 Added some docs 2016-08-06 01:23:40 +02:00
mrCookieSlime
9ebb277ff0 Updated plugin.yml 2016-08-06 01:16:40 +02:00
mrCookieSlime
870ad1a40e Cleaned up Supported Versions Check 2016-08-06 01:11:32 +02:00
mrCookieSlime
4fc109f7d5 Revert broken Bows 2016-08-06 01:09:03 +02:00
BlackBeltPanda
4da36b51fc Fix imports 2016-08-05 09:04:09 -04:00