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

475 Commits

Author SHA1 Message Date
Florian CUNY
b4e85d96e7
Fixed Android being able to break command blocks 2017-11-23 09:16:05 +01:00
TheBusyBiscuit
fc58f9163d
Merge pull request #494 from AtomicScience/master
New Slimefun block - Automatic Ignition Chamber
2017-11-21 18:26:20 +01:00
AtomicScience
afb341acff
"resf" renamed to "chamber" 2017-11-21 11:25:06 +03:00
AtomicScience
cb5f146840
Code optimization 2017-11-20 17:59:20 +03:00
AtomicScience
89b1da7db8 Changed the way of detect the Chamber 2017-11-20 15:48:52 +03:00
atom
7270eee3c4 Changed the way of detect the Chamber in onIgnitionChamberItemMove 2017-11-20 15:48:17 +03:00
AtomicScience
b61bd7c3ef
Updated "machines.ignition-chamber-no-flint" 2017-11-20 15:12:09 +03:00
AtomicScience
4180f5548c
Changed the lore of Chamber a little 2017-11-20 15:09:36 +03:00
TheBusyBiscuit
4cb573b4bc
Merge pull request #498 from Redemption198/master
Opening the SF guide with commands #491
2017-11-20 12:15:38 +01:00
Redemption
373765d1ac
Changed guide's default permission to true 2017-11-19 23:06:36 +01:00
Redemption
d100d03b8c
Added slimefun.command.guide permission 2017-11-19 23:01:18 +01:00
Redemption
3bba53b20d
Added permission check to /sf guide command
The /sf guide command will now only be executed if the player has the permission "slimefun.command.guide"
2017-11-19 22:59:58 +01:00
Redemption
3f60207be7
Made a mistake
version reverted to: version: ${project.version}
2017-11-18 18:09:07 +01:00
Redemption
d6794c5820
Added permission check to open_guide
Now the command "/sf open_guide" will be executed only if the player has the "slimefun.command.open_guide" permission. (Default: op)
2017-11-18 18:05:50 +01:00
Redemption
e3ed803856
Added slimefun.command.open_guide permission 2017-11-18 18:03:19 +01:00
Redemption
cb354cd6eb
Added "commands.open_guide" description 2017-11-18 17:43:25 +01:00
Redemption
c2a641fd60
Open SF Guide with a command #491
From the suggestion of @oddare (https://github.com/TheBusyBiscuit/Slimefun4/issues/491), I've added the command to open the Slimefun Guide directly with the command "/sf open_guide". I also added the tab completion "open_guide" and a description of it.
2017-11-18 17:38:39 +01:00
AtomicScience
62293bed4e
Changed the lore of 'Ignition Chamber' 2017-11-16 13:23:09 +03:00
TheBusyBiscuit
6c3eb302c6
Merge pull request #493 from Poslovitch/maven-improvements
Use ${project.version} from pom.xml in plugin.yml
2017-11-15 21:55:09 +01:00
atom
9645b8db81 Revert "Added few more types of Jerky food - all vanilla types of meat and also fish. Removed 'Saturation' effects and changed types of Jerky food"
This reverts commit 534ea6b14f.
2017-11-15 21:45:52 +03:00
atom
534ea6b14f Added few more types of Jerky food - all vanilla types of meat and also
fish. Removed 'Saturation' effects and changed types of Jerky food
2017-11-15 21:28:38 +03:00
AtomicScience
bf667c30c8
Merge pull request #1 from AtomicScience/AtomicScience-patch-1
Fix issue #319
2017-11-15 20:58:15 +03:00
AtomicScience
6605ac9fe3
Fix issue #319 2017-11-15 20:56:04 +03:00
AtomicScience
d9ef5bab02
Fix issue #319 2017-11-15 20:52:30 +03:00
AtomicScience
d8655437c8
Added a research for Ignition Chamber 2017-11-15 19:23:22 +03:00
AtomicScience
3786ad327b
Fix some probelms 2017-11-15 15:24:18 +03:00
AtomicScience
ff9d0a08cf
Add files via upload 2017-11-15 14:36:30 +03:00
Florian CUNY
5a8a47537b Use ${project.version} from pom.xml in plugin.yml 2017-11-15 09:31:25 +01:00
TheBusyBiscuit
b855766239
Merge pull request #482 from akashaggarwal7/master
Minor fix and enhancement to tab completion
2017-11-01 11:52:28 +01:00
Akash Aggarwal
9a288debd6 Smart tab completion 2017-11-01 14:59:05 +05:30
Akash Aggarwal
ed6ba8ca67 Fixed typo 2017-11-01 14:31:07 +05:30
TheBusyBiscuit
96e8e33391 Merge pull request #457 from dpkirchner/master
Fix ConcurrentModificationException that occurred when reactor explodes.
2017-10-14 09:45:03 +02:00
David Kirchner
393b4835d9 Fix ConcurrentModificationException that occurred when reactor explodes.
CraftBukket's HumanEntity.closeInventory() apparently removes the human
from the inventory's viewer list, resulting in an exception when we were
calling closeInventory while iterating over the list of said viewers.

Fixes TheBusyBiscuit/Slimefun4#364.
2017-10-08 19:46:42 -07:00
TheBusyBiscuit
5dd53540ee Merge pull request #448 from dpkirchner/master
Don't consume XP until we are about to unlock the requested research.
2017-10-07 09:15:57 +02:00
David Kirchner
287dcba37a Don't consume XP until we are about to unlock the requested research.
Fixes TheBusyBiscuit/Slimefun4#195.
2017-10-06 23:54:55 -07:00
TheBusyBiscuit
2644be0e2f Merge pull request #447 from dpkirchner/master
Only create a hopper "target" as long as the block is actually a hopper.
2017-10-06 16:46:28 +02:00
David Kirchner
f278abc76a Only create a hopper "target" as long as the block is actually a hopper.
This fixes a bug that led to abandoned ArmorStands (what I was referring
to when I said "target") that lingered after the hopper was destroyed.
The issue was that tick (called asynchronously) was creating a new
ArmorStand (via InfusedHopper.getArmorStand()) after the block handler's
onBreak call removed the one that was created in onPlace.

The code that recreates the ArmorStand remains in tick() just in case,
somehow, it ends up getting removed by some other force. However, this
code should never be reached if the hopper itself is removed.

This fixes TheBusyBiscuit/Slimefun4#189,
fixes TheBusyBiscuit/Slimefun4#190, and
fixes TheBusyBiscuit/Slimefun4#428.
2017-10-05 19:49:33 -07:00
TheBusyBiscuit
4e57bc30df Merge pull request #446 from dpkirchner/master
Remove code that swaps stacks of items between cursor and furnace.
2017-10-05 11:32:18 +02:00
David Kirchner
525dcf1594 Remove code that swaps stacks of items between cursor and furnace.
Shift-clicking stacks in and right-clicking while holding a stack
on your cursor over the furnace now works the same as those actions
work with other blocks such as the workbench.

Fixes TheBusyBiscuit/Slimefun4#328 and addresses
TheBusyBiscuit/CS-CoreLib#19 (which was indeed not a CS-CoreLib
issue).
2017-10-04 18:48:32 -07:00
TheBusyBiscuit
79c83c691a Update plugin.yml 2017-09-10 19:25:34 +02:00
TheBusyBiscuit
76a45475ca Merge pull request #425 from Poslovitch/piston-duplication-fix
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/415
2017-09-10 19:23:22 +02:00
TheBusyBiscuit
691363d655 Merge pull request #426 from Poslovitch/408-fix
Fixes ignored frequencies for Cargo
2017-09-10 19:22:19 +02:00
Poslovitch
319238f4b3 Fixes ignored frequencies for Cargo
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/408

Was due to the JSON storage format (everything is String). #getInt was
therefore returning 0.
2017-09-10 16:13:59 +02:00
Poslovitch
eb17f19258 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/415 2017-09-10 11:05:54 +02:00
TheBusyBiscuit
55731ef532 Explicitly declare type arguments 2017-08-24 00:03:49 +02:00
TheBusyBiscuit
91150e53a6 Merge pull request #402 from Poslovitch/391-395-fix
Blockstates must be explicitly updated as of 1.12.1
2017-08-21 18:28:31 +02:00
Poslovitch
c34673ac14 Blockstates must be explicitly updated as of 1.12.1
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/391
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/395
2017-08-20 18:37:09 +02:00
TheBusyBiscuit
698ce1877a Merge pull request #398 from Poslovitch/runes-recipes
Crafting a Water Ancient Rune now gives 4 instead of 2
2017-08-18 09:30:38 +02:00
Poslovitch
4aac192776 Crafting a Water Ancient Rune now gives 4 instead of 2 2017-08-17 13:08:59 +02:00
TheBusyBiscuit
4152e3ed0e Merge pull request #397 from Poslovitch/documentation
Documentation - 1
2017-08-15 20:13:49 +02:00