mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
986 Commits 1 Branch 0 Tags 64 MiB
862c14c403
Commit Graph

711 Commits

Author SHA1 Message Date
TheBusyBiscuit
862c14c403
Merge branch 'master' into master 2019-08-03 18:08:51 +02:00
TheBusyBiscuit
9afba9fa78
Merge pull request #984 from NihilistBrew/changetowire 
Add copper wire
 2019-08-03 17:54:37 +02:00
NihilistBrew
50d74ced10
Fixed indents 2019-08-03 17:52:10 +02:00
NihilistBrew
8c8996368b
fix PR 2019-08-03 17:39:41 +02:00
NihilistBrew
460c082a51
Fixed research indent #2 2019-08-03 17:03:54 +02:00
NihilistBrew
5eaf3949b7
Fixed research indent 2019-08-03 17:02:32 +02:00
NihilistBrew
6af9307fe1 Accidentally edited a LOC 2019-08-02 15:04:22 +02:00
NihilistBrew
09b961ad1d Added sandstone to grind stone 2019-08-02 14:55:07 +02:00
NihilistBrew
78cea97fff Add copper wires 2019-08-02 13:20:28 +02:00
NihilistBrew
00d376e213
Update SlimefunMachine.java 2019-08-01 12:03:08 +02:00
NihilistBrew
60064a0fe1 Added OUTPUT_CHEST functionality 
S
 2019-08-01 11:01:43 +02:00
TheBusyBiscuit
bf61b4a42f Added GitHubBuilds-Updater for development-builds 2019-07-17 14:57:52 +02:00
Nathan Adhitya
e1190a5d1e
Update ItemListener.java 2019-07-08 17:07:38 +07:00
SoSeDiK
839c263955 Replace SimpleJSON with Gson 2019-06-23 23:03:20 +03:00
CyberPatriot
f9ee475dca Push 2019-06-20 18:12:23 -05:00
CyberPatriot
ebd1275f89
Change boolean allow = true to false 
The reason for this is because it solves a duplication glitch.
 2019-06-20 17:50:03 -05:00
TheBusyBiscuit
2812b84ea8 Minor Code Optimizations 2019-06-20 10:12:34 +02:00
TheBusyBiscuit
7c011d916a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-06-20 09:51:15 +02:00
TheBusyBiscuit
1fd0b40f9f Removed URID 2019-06-20 09:50:59 +02:00
TheBusyBiscuit
5656a0564f
Update AncientAltarListener.java 2019-06-19 22:33:47 +02:00
TheBusyBiscuit
0a5c9e901e
Fixed Ancient Altar Items 2019-06-19 22:32:09 +02:00
CyberPatriot
2f301be679
Update ReactorHologram.java 2019-06-19 09:26:30 -05:00
CyberPatriot
3e6767cfb3
Update EnergyHologram.java 2019-06-19 08:32:33 -05:00
CyberPatriot
569f9bb329
Fix holograms for Cargo and energy 2019-06-19 08:32:18 -05:00
TheBusyBiscuit
4946d428ad Fixed Item Recognition System 2019-06-19 08:46:43 +02:00
TheBusyBiscuit
27cb4c389c Fixed Ancient Altar Recipes for good 2019-06-18 17:39:59 +02:00
TheBusyBiscuit
b2420b8271 Fixed Ancient Altar Recipes 2019-06-18 15:35:16 +02:00
TheBusyBiscuit
b333cfd7a5 Improved Ancient Altar Recipe Recognition System 2019-06-18 14:55:52 +02:00
Bas Verhoeven
eba6fb041f Drop Slimefun items when broken by another Slimefun tool 
When a Slimefun item that doesn't have a BlockHandler is broken by a
tool that does have a BlockHandler and that tool's BlockHandler returns
true, Slimefun would stop handling the "onBlockBreak" event and would
not drop the Slimefun item that was broken but some vanilla block
instead.

This commit attempts to fix the way those events are handled, ensuring
that if a Slimefun item is broken one is dropped for the player.
 2019-06-13 21:18:43 +02:00
CyberPatriot
877e01b1be
Fix for issue #879 
This edit is for issue #879 . Tested on latest versions of Slimefun, ChestTerminal, and CS-CoreLib. 1.13 is to be determined.
 2019-06-12 23:48:38 -05:00
TheBusyBiscuit
78cbc990f4 Fixes #912 2019-06-11 13:27:24 +02:00
TheBusyBiscuit
1c600efee3 Possibly fixes #822 2019-06-11 12:45:50 +02:00
Steve
3900cb7aff
Update ItemListener.java 2019-06-10 22:32:31 +04:00
Bas Verhoeven
7b2a869abe Damage explosive pickaxe on use (configurable, off by default) 
The Explosive Pickaxe currently doesn't take any damage and therefore
doesn't lose durability, which isn't a desirable behavior for some of
us.

This commit adds a 'damage-on-use' item setting for EXPLOSIVE_PICKAXE,
which is disabled by default. When enabled, the Explosive Pickaxe will
get damaged for each block it breaks, in the same way a normal Diamond
Pickaxe would get damage if it were to break those blocks. This seems
to be similar to how Slimefun damages other tools.

Players can still enable Unbreaking (e.g. durability) on the pickaxe.
 2019-05-30 21:07:36 +02:00
Bas Verhoeven
0af6ec13d6 Do not allow more than 54 items in reactor/generator setup guide slots 
If we don't, opening the schematics for a Bio Reactor results in

"IllegalArgumentException: Size for custom inventory must be a multiple
 of 9 between 9 and 54 slots"

And the player is simply handed the Bio Reactor, which they can place
and use. Once they do that, the Slimefun guide can't be used until they
reconnect.

For generators and reactors we show the fuels underneath the schematics
or build instructions. When there are more fuels than available space to
show them, we'll overflow, causing the custom inventory to not work and
Slimefun throwing exceptions.
 2019-05-30 20:08:35 +02:00
TheBusyBiscuit
3010e93675 Fixes #895 2019-05-30 13:50:20 +02:00
TheBusyBiscuit
11fec71a94 Made Credits load asynchronously 2019-05-30 13:42:06 +02:00
TheBusyBiscuit
ee4490c240 Fixes #839 2019-05-30 12:08:14 +02:00
freethemice
5ffb1a5170
unclosed character literal 
fixes "unclosed character literal" error some people may get on compile.
 2019-05-28 17:19:15 -05:00
Kry-Vosa
59a0811445
Fix for #913 
Ported fix from #804
 2019-05-24 14:51:49 +02:00
Kry-Vosa
d9015cbbf3
Fix for #915 
setCustomName removes unnecesary ChatColor codes (e.g. &r that doesn't reset anything). Saving the true CustomName in BlockStorage resolves the issue.
 2019-05-22 18:14:32 +02:00
sarhatabaot
f30c630bee Update JetBootsTask.java 2019-05-04 22:34:25 +03:00
sarhatabaot
1470ad598a Implemented SlimefunTask in Tasks 
* Implemented SlimefunTask in Tasks.
* This removes the duplication in the code.
 2019-05-04 22:31:26 +03:00
sarhatabaot
6b5b55f988 Changed access levels to enable inheritation of variables 
Changed access levels to enable inheritation of variables in sub classes.
 2019-05-04 22:30:33 +03:00
sarhatabaot
3c651dcccb Update SlimefunTask.java 2019-05-04 22:20:42 +03:00
sarhatabaot
2262222f60 Revert "Revert "Implemeted abstract Task class"" 
This reverts commit 74b89b9380.
 2019-05-04 22:19:12 +03:00
sarhatabaot
74b89b9380 Revert "Implemeted abstract Task class" 
This reverts commit 82b3f3c06c.
 2019-05-04 22:18:53 +03:00
sarhatabaot
82b3f3c06c Implemeted abstract Task class 
* Removes the duplicated code in every Task class.
 2019-05-04 22:18:28 +03:00
sarhatabaot
b20851da07 Encapsulated variables 2019-05-04 22:16:20 +03:00
sarhatabaot
f6312a9bd9 Encapsulated variables 2019-05-04 22:07:56 +03:00