1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Commit Graph

192 Commits

Author SHA1 Message Date
TheBusyBiscuit
eec510d32f
Merge pull request #979 from dniym/TableSaw
Table saw
2019-08-03 20:06:05 +02:00
dNiym
e62a3d8509 Combined research for Table_Saw and Saw_Mill 2019-08-03 13:51:34 -04:00
dNiym
751cc88321 Re-Added SAW_MILL to research 2019-08-03 13:44:42 -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
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
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
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
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
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
4946d428ad Fixed Item Recognition System 2019-06-19 08:46:43 +02:00
TheBusyBiscuit
b333cfd7a5 Improved Ancient Altar Recipe Recognition System 2019-06-18 14:55:52 +02:00
TheBusyBiscuit
1c600efee3 Possibly fixes #822 2019-06-11 12:45:50 +02:00
Bas Verhoeven
7b2a869abe Damage explosive pickaxe on use (configurable, off by default)
The Explosive Pickaxe currently doesn't take any damage and therefore
doesn't lose durability, which isn't a desirable behavior for some of
us.

This commit adds a 'damage-on-use' item setting for EXPLOSIVE_PICKAXE,
which is disabled by default. When enabled, the Explosive Pickaxe will
get damaged for each block it breaks, in the same way a normal Diamond
Pickaxe would get damage if it were to break those blocks. This seems
to be similar to how Slimefun damages other tools.

Players can still enable Unbreaking (e.g. durability) on the pickaxe.
2019-05-30 21:07:36 +02:00
TheBusyBiscuit
11fec71a94 Made Credits load asynchronously 2019-05-30 13:42:06 +02:00
Kry-Vosa
59a0811445
Fix for #913
Ported fix from #804
2019-05-24 14:51:49 +02:00
WalshyDev
733f401ff6 SF 4.1.17 - MC v1.14 2019-04-28 16:22:30 +01:00
jellysnake
0d65da0dd7
Fix miners not having the correct range 2019-04-19 01:07:35 +10:00
SoSeDiK
3e2f903425 Optimize tasks running 2019-03-30 14:06:44 +02:00
SoSeDiK
0794fe8a2c Rename ORGANIC_FOOD and FERTILIZER 2019-03-30 11:59:52 +02:00
TheBusyBiscuit
358a73f73b
Merge pull request #871 from bverhoeven/master
Fix Soulbound Axe duplication bug
2019-03-29 22:58:04 +01:00
Bas Verhoeven
6cbc0a9f92 Fix Soulbound Axe duplication bug
Similiar to 2ae249dec4

Fixes issue #870
2019-03-29 22:45:15 +01:00
SoSeDiK
c8965e120f Replaced deprecated code parts 2019-03-27 22:10:19 +02:00
SoSeDiK
9e9e36e5c2 Replaced Durability with Damageable meta 2019-03-27 22:09:04 +02:00
SoSeDiK
80642eeed1 Replaced deprecated enchantments code 2019-03-27 21:34:20 +02:00
TheBusyBiscuit
8c2746e775
Merge pull request #860 from SoSeDiK/spawners
Spawners
2019-03-27 16:40:44 +01:00
SoSeDiK
0561cf9e05 Optimized code 2019-03-26 22:56:40 +02:00
SoSeDiK
ad462d1b50 Added BlockBreakHandler for REPAIRED_SPAWNER 2019-03-26 22:51:04 +02:00
SoSeDiK
c4b096434c Updated CoreProtect API 2019-03-26 22:17:33 +02:00
SoSeDiK
ef868eae31 Removed unused imports 2019-02-23 23:14:01 +02:00
BuildTools
e950b264d8 Replaced some deprecated methods. 2019-01-18 20:38:02 +01:00
Sniddunc
092d79dda7 Fixed Sawmill Bug where only 1 item was dropped 2018-11-24 01:19:24 -05:00
VoidAngel
2ae249dec4
Fixes lumber axe dupe #797 2018-11-09 12:54:01 -08:00
TheBusyBiscuit
bd0c1949ba Minor changes 2018-09-06 12:50:49 +02:00
TheBusyBiscuit
58ead59419 Added missing 1.13 stuff 2018-09-05 21:02:57 +02:00
MisterErwin
55c3d6f711 Re-Added isItemSimiliar for ALWAYS 2018-09-05 18:11:32 +02:00
MisterErwin
60b08ac917 Got rid of "is Similar" - as mc 1.13 now used a Material for every Item
This one is WIP as all the colours & wood & stone types have to be re-added.
Please also take a look
2018-09-05 18:11:21 +02:00
MisterErwin
83f3fb4c4b Fied charcoal 1.13 material 2018-09-05 18:10:21 +02:00
DrOreo002
9d3ca22b1f Some code cleanup and fix grappling hook dupe 2018-07-15 13:02:45 +07:00
VoidAngel
ae83e65871
Fix misplaced parentheses for digital miners
Fixes issue #734
2018-07-09 17:55:32 -07:00