1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Commit Graph

267 Commits

Author SHA1 Message Date
Oliver Wright
f30c61fcfc
Check if the chunk is loaded instead of relying on exceptions 2018-03-10 19:08:18 +00:00
Oliver Wright
2c0dc15e4c
Create a Network class to manage networks in a stateful way 2018-03-10 01:05:15 +00:00
Meta-Win
e7e195a43e
Fix Conflict Names 2018-02-15 14:24:27 -02:00
Dylan Xaldin
16899eb96a Fix Reinforced Spawners being a Pig Spawner when placed. 2018-02-07 19:06:06 -06:00
TheBusyBiscuit
4f9c36c8a2
Merge pull request #557 from StarWishsama/master
correct word in Files.java
2018-01-06 12:49:49 +01:00
StarWishsama
4d9b141f23
correct word of Files.java 2017-12-31 09:07:02 +08:00
Redemption
2a80104402
Removed useless checks 2017-12-28 23:15:09 +01:00
Redemption
815557c29e
Update SlimefunSetup.java 2017-12-28 11:44:54 +01:00
Redemption
349d4f7e90
Fixed pedestal not dropping item when is broken or explodes 2017-12-28 11:11:03 +01:00
Redemption
f9a6225793
Reverted to single message for obstructed pedestral. 2017-12-26 00:15:29 +01:00
Redemption
12ec120d48
Split pedestal obstructed message.
Now there are two messages for the obstructed pedestal, one for blocks and one for liquids.
2017-12-25 20:45:44 +01:00
Florian CUNY
cd741d19d5 Fix NPE on BlockBreakEvent with Smelter's Pickaxe
as well as optimizing it a bit.

Fixes #367
2017-12-09 15:54:22 +01:00
Florian CUNY
5fb3ec967b Fixed typo in SlimefunSetup 2017-12-09 15:37:53 +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
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
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
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
179ad06bbf
Changed cant-place to cannot-place 2017-11-22 21:19:25 +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
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
f4bc3d1f80
Changed pedestal.obstruct
Changed PEDESTAL.obstructed to machines.ANCIENT_PEDESTAL.obstructed
2017-11-22 10:29:19 +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
AtomicScience
b61bd7c3ef
Updated "machines.ignition-chamber-no-flint" 2017-11-20 15:12:09 +03:00
Redemption
cb354cd6eb
Added "commands.open_guide" description 2017-11-18 17:43:25 +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
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
cc79e62f34 Made use of the renamed methods 2017-10-13 16:34:38 +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
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
Poslovitch
4aac192776 Crafting a Water Ancient Rune now gives 4 instead of 2 2017-08-17 13:08:59 +02:00
Poslovitch
6eecee0eae Documented WikiSetup 2017-08-14 18:16:09 +02:00
Poslovitch
00ef07b0bb Added a research for blistering ingots 2017-08-12 15:18:05 +02:00
Poslovitch
bc53533ca4 Documented and improved Researches 2017-06-23 13:06:08 +02:00
Poslovitch
cddaf1c1a6 Little color fixes in messages 2017-06-22 14:20:31 +02:00
Poslovitch
b3ec105ddc Removed unused import & modified messages 2017-06-19 15:58:32 +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
John000708
5d3c7b643e 1.12 Support 2017-06-13 19:28:54 +02:00
AlexLander123
4a23613277 Added unplaceable-blocks for BlockPlacer 2017-05-30 17:14:11 +08:00
TheBusyBiscuit
9ae4baab44 Extend Backpack Fixes to Cooler 2017-05-02 15:38:20 +02:00
VoidAngel
1c04e66b65 Fixed typo 2017-04-25 09:16:25 -07:00
VoidAngel
41d462b265 Update SlimefunSetup.java 2017-04-25 08:21:15 -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
VoidAngel
c5f110dca4 Added backpack already open message 2017-04-21 10:01:38 -07: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
1962dbb0a5 Chain Armor no longer spams messages 2017-04-09 09:59:45 +02:00
TheBusyBiscuit
f751eafc86 Fixed Jet Boots Recipe 2017-04-09 09:46:05 +02:00
TheBusyBiscuit
10d87d37b3 Fixed Backpack Crafting 2017-04-08 19:19:29 +02:00
TheBusyBiscuit
8ebae91e36 You can now upgrade Backpacks 2017-04-08 19:13:06 +02:00
Mason
552af5d9cd Added Trash Can 2017-03-15 05:53:34 -04:00
Mason
b67a50b2d1 Added Cargo Management 2017-03-15 05:50:00 -04:00
John000708
5c47a3f4fe Fixed Multimeter not showing with colors 2017-02-24 19:45:36 +01:00
John000708
4c5f7d5766 Fixed Shulker Boxes not dropping with contents in them 2017-02-06 19:56:37 +01:00
John000708
0d2ff61387 Added CoreProtect logging for the Explosive Pickaxe 2017-02-06 19:28:06 +01:00
TheBusyBiscuit
73210d0a99 Fixed Message 2017-01-21 08:29:03 +01:00
TheBusyBiscuit
0b4127d7d3 Added WikiSetup.class 2017-01-19 18:26:56 +01:00
TheBusyBiscuit
c7b47bd934 Added /sf versions 2017-01-18 15:37:00 +01:00
NathanAdhitya
7b86df37fc . 2017-01-01 21:07:26 +07:00
NathanAdhitya
a3afb14a10 . 2017-01-01 20:26:50 +07:00
NathanAdhitya
1af833bf96 Tier 2 Electric Ore Grinder Speed and Energy is not at the proper value. 2017-01-01 20:23:53 +07:00
NathanAdhitya
8ff8daf4b5 Tier 2017-01-01 20:08:40 +07:00
AlexLander123
c565252072 Implemention of ExcludedTool and ExcludedSoulboundTool
Fix Soulbound Shovel and Soulbound Hoe Duplication Bug;
2016-12-30 10:09:08 +08:00
NathanAdhitya
8743da7c8e Coal Ore is more reasonable to give 4 coal, rather than two in Advanced Digi-Miner 2016-12-20 20:45:02 +07:00
NathanAdhitya
e4400a5229 Cargo Connected Color Text Doesn't Work on a few servers. 2016-12-19 17:19:21 +07:00
mrCookieSlime
3e7071561b Added Post Handler Method 2016-12-05 19:41:29 +01:00
mrCookieSlime
c3033bb6b0 API Additions 2016-12-05 19:39:58 +01:00
TheBusyBiscuit
4ad601f90d Merge pull request #40 from John000708/master
Fixed some stuff
2016-12-04 15:18:05 +01:00
BuildTools
fa0f0a4012 Fixed some stuff 2016-12-04 00:08:59 +01:00
mrCookieSlime
0df97edfcc Changed Electric Ingot Pulverizer Speed 2016-11-28 20:06:37 +01:00
mrCookieSlime
622009d1b3 Minor Tweaks 2016-11-28 19:57:57 +01:00
BuildTools
ac97c0435c Added researches
Fixed minor issue
2016-11-27 19:57:36 +01:00
BuildTools
ef9fa6a54b Update Version 2016-11-27 19:34:45 +01:00
mrCookieSlime
fe00a62730 Added Nether Ice 2016-11-26 13:03:45 +01:00
BuildTools
b31229deaa Added Electrified Crucibles 2016-11-26 12:54:32 +01:00
BuildTools
9f3bd4caf2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2016-11-26 12:49:54 +01:00
BuildTools
8fc62d4a30 Minor tweaks 2016-11-26 12:41:20 +01:00
mrCookieSlime
d5b9c98704 Added new Tiers of Electric Smelteries and Electrified Crucibles 2016-11-26 12:37:43 +01:00
mrCookieSlime
1f4993e3cf Minor changes 2016-11-24 18:10:54 +01:00
BuildTools
ef748fe01e Added Electric Crucible 2016-11-24 17:36:46 +01:00
BuildTools
3e470d87fb Replaced all § with & 2016-11-23 16:51:57 +01:00
mrCookieSlime
1b674aed05 Minor Changes to the Nether Star Reactor 2016-11-20 21:40:05 +01:00
mrCookieSlime
60635d6475 Added Coolant Hologram 2016-11-20 21:35:24 +01:00
BuildTools
269e10d2ff Added Nether Start Reactor. 2016-11-20 21:06:13 +01:00
BuildTools
b7c760649e Made the Nuclear Reactor abstract, which will allow developers to make their own reactors. 2016-11-20 17:50:20 +01:00
BuildTools
6b08a18f1f Added Advanced Farmer Android - Allows the harvest of Exotic Garden plants. 2016-11-20 00:23:37 +01:00
BuildTools
edbf5234f0 Added the Ingot Pulverizer to the researches 2016-11-13 17:45:05 +01:00
BuildTools
1b4cf5f9c3 Added Ingot Pulverizer. 2016-11-13 17:40:26 +01:00
BuildTools
ba644401f4 Fixed Chiseled Quartz being used for infinite silicon in a smeltery. (Also fixed for any other similar items with different data) 2016-10-28 16:32:23 +02:00
mrCookieSlime
e6cb35f902 Changed Vitamins Recipe 2016-07-21 12:28:36 +02:00
mrCookieSlime
43c91b37dd Added Infused & Soulbound Elytras 2016-05-29 10:46:11 +02:00
mrCookieSlime
cc90907aa6 Fixed Carbonado GPS Transmitter not being destroyable 2016-05-29 10:30:40 +02:00
BuildTools
806854557a Added a recipe for the Elytra. 2016-05-21 22:41:50 +02:00
mrCookieSlime
3ed3ac315c Fixed Night Vision Goggles Recipe 2016-05-20 16:11:52 +02:00
mrCookieSlime
ad1fb2dc3b Added /sf teleporter 2016-05-18 15:15:45 +02:00
mrCookieSlime
f887514fab Fixed Smelters Pick 2016-05-18 14:24:54 +02:00
mrCookieSlime
c5abb93185 Added 2 new Wiki Pages 2016-05-16 09:49:35 +02:00
mrCookieSlime
ab0ca1e2a7 Fixed Smelters/Explosive Pickaxe dropping Skeleton Skulls when breaking
Player Skulls
2016-05-15 13:11:20 +02:00
mrCookieSlime
7f286b0619 Fixed Raw Cod resulting in Cooked Salmon in the Electric Furnace 2016-05-02 16:01:07 +02:00
TheBusyBiscuit
afcf359d91 Gold Pan no longer calls an Event 2016-04-30 11:28:31 +02:00
mrCookieSlime
179196730e Added new Wiki Pages 2016-04-22 10:06:03 +02:00
mrCookieSlime
a0f4c52aba Fixed Blade of Vampires and Necrotic Skull Recipe 2016-04-16 23:42:30 +02:00
mrCookieSlime
686004304c Slimefun 4 2016-04-14 18:24:03 +02:00