1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

6464 Commits

Author SHA1 Message Date
MisterErwin
ef74d04125 Using 1.13 Skull Materials and Entity Types 2018-09-05 17:50:48 +02:00
MisterErwin
2d9afec1a4 Using BlockData Directional for onBlockDispensing 2018-09-05 17:50:15 +02:00
MisterErwin
acb4d0a922 Added the new Leaves & "clay"/terracotta to the ECrucible 2018-09-05 17:49:47 +02:00
MisterErwin
171e244a80 Using 1.13 Materials for CargoNodes (and the MaterialHook for the channel colour) 2018-09-05 17:49:14 +02:00
MisterErwin
da9b93b32e Using 1.13 Materials and Particles for Machines 2018-09-05 17:44:03 +02:00
MisterErwin
860a2dfe09 Using 1.13 Materials for Machines 2018-09-05 17:43:36 +02:00
MisterErwin
9ab28ad47c Using 1.13 Materials for Machines 2018-09-05 17:43:06 +02:00
MisterErwin
d46aaad34c Using 1.13 Materials 2018-09-05 17:42:34 +02:00
MisterErwin
18c62bca95 Using 1.13 Materials 2018-09-05 17:41:08 +02:00
MisterErwin
7a6dc71f1b Removed unnötiges ToDo 2018-09-05 17:40:26 +02:00
MisterErwin
40bf16390f Added RainbowTicker 2018-09-05 17:40:11 +02:00
MisterErwin
9f8b728249 Added 1.13 logs 2018-09-05 17:39:51 +02:00
MisterErwin
3f588e92ba Disabled the AdvancedRainbowTicker - is this one still needed? 2018-09-05 11:41:54 +02:00
MisterErwin
f18aa30631 Using vanilla/spigot particles 2018-09-05 11:30:49 +02:00
MisterErwin
d5aa03ca28 Using vanilla/spigot particles 2018-09-05 11:30:22 +02:00
MisterErwin
812fd1e271 Updated to 1.13 biomes 2018-09-05 11:30:01 +02:00
MisterErwin
aafbdc7512 Added api-version to plugin.yml 2018-09-05 11:23:17 +02:00
TheBusyBiscuit
93039c7cc3 First steps towards 1.13.1 port. 2018-09-04 11:33:57 +02:00
TheBusyBiscuit
b7385d1fc1
Merge pull request #751 from creator3/master
Hopefully reduce input node breakage
2018-08-06 21:17:46 +02:00
TheBusyBiscuit
54d7ddc98f
Merge pull request #741 from DrOreo002/master
Some code cleanup (not all of them), Grappling Hook dupe fix, And ancient altar fix
2018-08-06 21:13:56 +02:00
TheBusyBiscuit
1c649a4537
Merge branch 'master' into master 2018-08-06 21:13:46 +02:00
TheBusyBiscuit
79ef1c73dc
Merge pull request #733 from Ajptlink/Ajptlink-patch-1
Fixed issue #686
2018-08-06 21:12:18 +02:00
TheBusyBiscuit
934f46a03f
Merge pull request #730 from Firebuggie/master
Fixes Butcher Androids being able to loot Wither Skeleton Skulls again.
2018-08-06 21:02:47 +02:00
creator3
338621670b Hopefully reduce input node breakage 2018-07-31 15:55:18 -04:00
DrOreo002
9d3ca22b1f Some code cleanup and fix grappling hook dupe 2018-07-15 13:02:45 +07:00
Anom Suryadinata
c661d09f9a
Merge pull request #3 from TheBusyBiscuit/master
Updating my fork
2018-07-15 10:41:38 +08:00
TheBusyBiscuit
af42816c02
Merge pull request #736 from VoidAngel/patch-3
Fix misplaced parentheses for digital miners
2018-07-11 10:24:38 +02:00
VoidAngel
ae83e65871
Fix misplaced parentheses for digital miners
Fixes issue #734
2018-07-09 17:55:32 -07:00
Ajptlink
391845fe86
Update RitualAnimation.java 2018-07-09 16:41:22 +02:00
Firebuggie
bf643cf02e
Update AndroidKillingListener.java 2018-07-04 20:48:58 +02:00
TheBusyBiscuit
2a492ffbf9 Added versions to provided Maven dependencies 2018-06-28 22:32:01 +02:00
TheBusyBiscuit
69e1654985
Merge pull request #724 from AtomicScience/master
Fix issue #690
2018-06-23 14:05:03 +02:00
TheBusyBiscuit
4e15347f6a
Merge pull request #718 from creator3/master
Parse block info at startup
2018-06-23 14:01:08 +02:00
AtomicScience
a25bb15c93
Fix #690 2018-06-23 14:51:48 +03:00
creator3
ae3ba64f54 Parse block info at startup 2018-06-15 19:23:51 -04:00
TheBusyBiscuit
634c306342
Merge pull request #711 from SoSeDiK/Some-additions-and-fixes
Some additions and fixes
2018-06-11 14:46:18 +02:00
SoSeDiK
c0f959f211 Added two additional recipes
Allowed using acacia and dark oak logs for crafting the walking sticks.
2018-06-06 12:53:28 +03:00
SoSeDiK
a5e38577d2 Fixed colors in the Book GUI 2018-06-06 12:50:26 +03:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +03:00
SoSeDiK
6eb17d1d45 Removed unused imports 2018-06-06 11:46:18 +03:00
Anom Suryadinata
a91481a566
Merge pull request #2 from TheBusyBiscuit/master
Test
2018-06-03 18:55:10 +07:00
TheBusyBiscuit
40cbafa504
Merge pull request #706 from VoidAngel/master
Fixes soulbound backpack crafting
2018-05-21 21:47:21 +02:00
VoidAngel
24f09bc87a Fixes soulbound backpack craft crafting
Also a few more .clones() were added as a precaution for the future.
2018-05-21 12:38:42 -07:00
TheBusyBiscuit
d4a06ceb90
Update README.md 2018-05-21 21:17:32 +02:00
TheBusyBiscuit
919a9710ee
Update README.md 2018-05-21 21:11:01 +02:00
TheBusyBiscuit
e74d8c23d2
Update ISSUE_TEMPLATE.md 2018-05-21 20:58:23 +02:00
TheBusyBiscuit
803c19a27e
Removed BlockBreaker 2018-05-21 20:51:12 +02:00
TheBusyBiscuit
340fc046d0
Fixed Reactor Overflows 2018-05-11 13:11:13 +02:00
Anom Suryadinata
bfac1096a1
Merge pull request #1 from TheBusyBiscuit/master
Updating my fork
2018-05-09 11:09:26 +07:00
The Busy Bot
2ef7fbd575 Updated to Version: v4.1.15 2018-05-05 17:42:27 +00:00