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

404 Commits

Author SHA1 Message Date
Florian CUNY
858f964b82 Privatized fields in Talisman and EnderTalisman 2017-12-09 15:38:14 +01:00
Florian CUNY
5fb3ec967b Fixed typo in SlimefunSetup 2017-12-09 15:37:53 +01:00
Florian CUNY
9760fc75b1 Moved Miner Talisman listener from ToolListener to TalismanListener 2017-12-09 15:34:36 +01:00
Florian CUNY
24a5613c05 Fixed wrong "since" in ItemPickupListeners' documentation 2017-12-09 15:34:06 +01:00
TheBusyBiscuit
a93a5e88d6
Fixed Christmas Cake Recipe 2017-12-02 21:38:16 +01:00
Meta-Win
c3d3685420
Fix Christmas Cookie and Chocolate Milk Recipes 2017-12-02 17:39:34 -02:00
Florian CUNY
475eaae0b0 Fixed typo "Slimfun" to "Slimefun" 2017-12-01 19:28:12 +01:00
Florian CUNY
5fba0e37ac Fixes #510 2017-12-01 19:27:50 +01:00
TheBusyBiscuit
7e2fc76b12
Merge pull request #513 from Poslovitch/fix-333
Fixes juices not restoring hunger - #333 & #87
2017-12-01 18:00:40 +01:00
Florian CUNY
1763cc61f4
Fixed mishandled check 2017-12-01 17:46:22 +01:00
Florian CUNY
fc20062cd6 Fixed to check version is NOT 1.9 or 1.10 2017-12-01 13:11:05 +01:00
Florian CUNY
8ffb6ffd61 Changed the version check to 1.9 and 1.10 for easier future support 2017-12-01 10:08:31 +01:00
Florian CUNY
35b65139ce Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/333 and https://github.com/TheBusyBiscuit/Slimefun4/issues/87 2017-11-29 21:01:31 +01:00
TheBusyBiscuit
33f27d96c7
Merge pull request #504 from Poslovitch/patch-1
Fixed Android being able to break command blocks
2017-11-26 23:22:49 +01:00
TheBusyBiscuit
595ef5f907
Merge pull request #507 from Poslovitch/4.1.12
4.1.12
2017-11-26 09:51:07 +01:00
TheBusyBiscuit
fe4ec68a35
Merge pull request #502 from Poslovitch/slimefunitem-improvements
SlimefunItem : renames of some methods, made ghost configurable, changed "name" to "id" and privatized all fields
2017-11-26 09:50:41 +01:00
Florian CUNY
e2533d9b75 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/375 2017-11-25 22:07:00 +01:00
Florian CUNY
2696f5a8a5 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/334 2017-11-25 22:05:34 +01:00
TheBusyBiscuit
3bbd0e040c
Merge pull request #500 from Redemption198/master
Fixed ancient pedestal bug #499
2017-11-25 17:34:01 +01:00
TheBusyBiscuit
fc5be2778d
Merge pull request #503 from AtomicScience/ore_washer_fix
Ore washer dupe fix
2017-11-25 17:33:18 +01:00
Redemption
229dca3766
Added parameters to EventHandler 2017-11-25 13:31:13 +01:00
Florian CUNY
fd4d678332
Use brackets in loops 2017-11-25 10:31:09 +01:00
Florian CUNY
93f877a2d4 Error reports : prioritized Slimefun Environment (addons, etc) 2017-11-25 10:22:53 +01:00
Florian CUNY
6093b4cf49
Fixed some typo from 05b1fe77a5 2017-11-23 22:23:50 +01:00
Florian CUNY
18017680e8
Fixed some spacing 2017-11-23 22:21:02 +01:00
Florian CUNY
05b1fe77a5
Re-added all the "this." to #register(boolean) 2017-11-23 22:16:45 +01:00
Florian CUNY
c95bafad6a
Fixed #addWikipage(String) link to TheBusyBiscuit 2017-11-23 22:11:32 +01:00
Florian CUNY
b4e85d96e7
Fixed Android being able to break command blocks 2017-11-23 09:16:05 +01:00
AtomicScience
cc9c07ad60 Fix "Ore Washer Dupe" 2017-11-23 00:09:44 +03:00
AtomicScience
bda7a18c5b Fix "Ore Washer Fix" 2017-11-23 00:00:33 +03:00
Redemption
3fcfadb189
Update Messages.java 2017-11-22 21:21:39 +01:00
Redemption
51f23f90c1
Changed cant-place to cannot-place 2017-11-22 21:20:08 +01:00
Redemption
179ad06bbf
Changed cant-place to cannot-place 2017-11-22 21:19:25 +01:00
Poslovitch
2c2bc42540 Changed key "hide-in-recipe-book" to "hide-in-guide" 2017-11-22 20:39:18 +01:00
Poslovitch
502efd862b Revert requirePermissionToUse (not ready yet) 2017-11-22 20:37:30 +01:00
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