mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
4,665 Commits 1 Branch 0 Tags 64 MiB
277ecb4a29
Commit Graph

4665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
c8d53baf59 Merge pull request #329 from Poslovitch/fireworks-give 
Splited option to toggle fireworks into "when researched" & "when given"
 2017-06-19 15:25:40 +02:00
Poslovitch
9d4f6879ea Added an optional amount parameter for /sf give 
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/300
Also removed a useless online check, and adapted messages (may need the
owners to regenerate messages.yml file)
 2017-06-19 14:51:32 +02:00
Poslovitch
1e9bb5e0a3 Splited option to toggle fireworks into "when researched" & "when given" 
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/308
 2017-06-19 14:14:26 +02:00
TheBusyBiscuit
4930d54795 Updated "Unsupported Version" message 2017-06-14 12:35:25 +02:00
TheBusyBiscuit
a7752d7ed4 Merge pull request #321 from Poslovitch/fireworks 
Added option to toggle research fireworks
 2017-06-14 11:47:43 +02:00
Poslovitch
710d74585d Added option to toggle research fireworks 
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/308
 2017-06-14 10:57:11 +02:00
TheBusyBiscuit
f1374d0923 Merge pull request #320 from John000708/master 
1.12
 2017-06-13 20:01:27 +02:00
John000708
4eed2e1b61 Remove bad code 2017-06-13 19:59:39 +02:00
John000708
7f52070e08 You did not see this 2017-06-13 19:33:53 +02:00
John000708
a471e4f93c Update Version 2017-06-13 19:32:53 +02:00
John000708
5d3c7b643e 1.12 Support 2017-06-13 19:28:54 +02:00
John000708
d67470dfab Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2017-06-13 16:09:36 +02:00
TheBusyBiscuit
f2c43b5d3e Merge pull request #304 from AlexLander123/fixes 
Added unplaceable-blocks for BlockPlacer
 2017-05-30 15:32:55 +02:00
AlexLander123
4a23613277 Added unplaceable-blocks for BlockPlacer 2017-05-30 17:14:11 +08:00
John000708
cf1850dec8 Update Branch 2017-05-28 20:37:59 +02:00
TheBusyBiscuit
9ae4baab44 Extend Backpack Fixes to Cooler 2017-05-02 15:38:20 +02:00
TheBusyBiscuit
42015cec8d Update plugin.yml 2017-04-30 08:54:39 +02:00
TheBusyBiscuit
f95b2823ee Merge pull request #274 from TheBusyBiscuit/revert-252-patch-2 
Revert "Fixed Talisman of Anvil"
 2017-04-30 08:52:34 +02:00
TheBusyBiscuit
bf080a2a15 Revert "Fixed Talisman of Anvil" 2017-04-30 08:52:19 +02:00
TheBusyBiscuit
f1858c9807 Update CONTRIBUTING.md 2017-04-26 20:43:44 +02:00
TheBusyBiscuit
32e312b422 Updated plugin.yml 2017-04-25 18:46:21 +02:00
TheBusyBiscuit
a162d3c812 Merge pull request #267 from VoidAngel/master 
Backpack & crucible fixes
 2017-04-25 18:21:34 +02:00
VoidAngel
bc00c685d7 Removed uneeded import 2017-04-25 09:19:34 -07:00
VoidAngel
6af5a83ca5 Removed redundant code 2017-04-25 09:18:39 -07:00
VoidAngel
1c04e66b65 Fixed typo 2017-04-25 09:16:25 -07:00
VoidAngel
a76137aa2b Update BackpackListener.java 2017-04-25 08:23:22 -07:00
VoidAngel
41d462b265 Update SlimefunSetup.java 2017-04-25 08:21:15 -07:00
VoidAngel
a90028b6d6 Update ElectrifiedCrucible.java 2017-04-25 08:17:38 -07:00
VoidAngel
f59884455a Backpack fixes v2 
Fixes:
- Backpacks getting stuck in backpacks with number keys.
- Putting shulker boxes inside backpacks for infinite storage.
- A dupe where a player would drop the backpack at the same time as opening it.
 2017-04-24 15:41:25 -07:00
VoidAngel
b415032dea Backpack fixes 2017-04-24 15:35:02 -07:00
Jessica Phipps
85342c7973 Merge remote-tracking branch 'refs/remotes/TheBusyBiscuit/master' 2017-04-24 10:55:47 -07:00
VoidAngel
10e343be71 Fixed electric crucible inconsistency 
Hardened clay will now make water instead of lava (As the recipe is in the manual crucible)
 2017-04-24 10:47:48 -07:00
VoidAngel
8ecdec0491 Crucible fix 
Fix for the hardened_clay crucible recipe and prevent block place on use
 2017-04-24 10:43:12 -07:00
TheBusyBiscuit
f257d28b0f Merge pull request #262 from VoidAngel/master 
Prevent possible backpack dupes
 2017-04-21 19:15:00 +02:00
VoidAngel
c5f110dca4 Added backpack already open message 2017-04-21 10:01:38 -07:00
VoidAngel
f1a8816bfa Prevent possible backpack dupes 
This will prevent dupes from arising if a player obtains 2 of the same backpack from staff error, flukes, past exploits, etc.
 2017-04-21 09:59:59 -07:00
Jessica Phipps
5c9943de17 Merge remote-tracking branch 'refs/remotes/TheBusyBiscuit/master' 2017-04-21 09:50:14 -07:00
TheBusyBiscuit
e7479a403f Update README.md 2017-04-20 22:55:30 +02:00
TheBusyBiscuit
b882926fd5 Merge pull request #261 from VoidAngel/master 
Fix backpack dupe (And all similar dupes)
 2017-04-20 22:53:57 +02:00
VoidAngel
7c50fd691b Fix backpack dupe (And all similar dupes) 2017-04-20 11:23:29 -07:00
TheBusyBiscuit
03d9e1431e Merge pull request #252 from DeathlyPanda/patch-2 
Fixed Talisman of Anvil
 2017-04-15 09:48:20 +02:00
DeathlyPanda
07ac226556 Fixed Talisman of Anvil 
Issue was posted in: https://github.com/TheBusyBiscuit/Slimefun4/issues/229
 2017-04-14 20:29:54 -04:00
TheBusyBiscuit
7c69607cbd Merge pull request #249 from DeathlyPanda/patch-2 
Fix Pickaxe of Vein Mining Dupe
 2017-04-15 00:34:25 +02:00
DeathlyPanda
5d8b0e4ddb Simplified Patch 2017-04-14 18:25:02 -04:00
DeathlyPanda
52d42a5744 Fix Pickaxe of Vein Mining Dupe 
Fixed pickaxe to prevent duplication of ores.
 2017-04-13 09:42:07 -04:00
TheBusyBiscuit
ebfc6f418c Fixed Round-Robin Mode for Cargos 2017-04-10 10:08:06 +02:00
TheBusyBiscuit
3d21dae93c Reverted failed fix 2017-04-10 10:00:26 +02:00
TheBusyBiscuit
45554ce457 Fixed Cargo Round-Robin Mode 2017-04-10 09:57:58 +02:00
TheBusyBiscuit
5590118a52 Added elses 2017-04-10 09:46:21 +02:00
TheBusyBiscuit
1962dbb0a5 Chain Armor no longer spams messages 2017-04-09 09:59:45 +02:00