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

4742 Commits

Author SHA1 Message Date
Redemption
0eb52e6627
Removed else return (line 192) 2017-11-22 20:34:57 +01:00
Redemption
9ad714601b
Update Messages.java 2017-11-22 18:41:27 +01:00
Redemption
a0edb57464
Merge branch 'master' into master 2017-11-22 18:39:35 +01:00
Redemption
e57eec9b14
Added onBlockPlace event
Added onBlockPlace event to prevent block placements (by players) above the pedestals
2017-11-22 18:36:12 +01:00
Redemption
1749ae4131
Added messages.cant-place 2017-11-22 18:34:42 +01:00
Poslovitch
26c13b375e Explosive pickaxe could break BARRIER, and COMMAND blocks 2017-11-22 17:36:28 +01:00
Redemption
aa600a4ae3
Changed PEDESTAL.obstructed
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
2017-11-22 10:31:10 +01:00
Redemption
f4bc3d1f80
Changed pedestal.obstruct
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
2017-11-22 10:29:19 +01:00
Redemption
47c13fe9e7
Removed else at line 65 2017-11-21 19:33:05 +01:00
Redemption
d84e5a09e2
Pedestals now check for the block above 2017-11-21 19:32:06 +01:00
Redemption
cb7a8a3949
Added PEDESTAL.obstucted message 2017-11-21 19:27:31 +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
Florian CUNY
f2dd943df3 Added a "hide-in-recipe-book" option + cleaned up a lot of things
The SlimefunItem class was quite of a mess, due to all the successive additions made in the last year.
2017-10-14 14:42:14 +02:00
Florian CUNY
4e289a5ff5 Initialize some fields inline instead of constructors 2017-10-14 10:55:50 +02:00
TheBusyBiscuit
96e8e33391 Merge pull request #457 from dpkirchner/master
Fix ConcurrentModificationException that occurred when reactor explodes.
2017-10-14 09:45:03 +02:00
Florian CUNY
58b9bff978 Made the required permission a field 2017-10-13 21:12:33 +02:00
Florian CUNY
81c7bb169d Made use of the "id" instead of "name" of a SlimefunItem 2017-10-13 20:59:52 +02:00
Florian CUNY
657fd4d112 Added requirePermissionToUse field (https://github.com/TheBusyBiscuit/Slimefun4/issues/410) 2017-10-13 20:46:28 +02:00
Florian CUNY
cc79e62f34 Made use of the renamed methods 2017-10-13 16:34:38 +02:00
Florian CUNY
01d04caf66 Privatized all SlimefunItem fields 2017-10-13 15:56:48 +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