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

1567 Commits

Author SHA1 Message Date
TheBusyBiscuit
1d509cf52d Added a Recipe for the Totem of Undying (+ Altered Elytra Scale Recipe) 2019-10-07 20:24:07 +02:00
TheBusyBiscuit
0b4f07ac44 Fixes #1171 2019-10-07 19:24:52 +02:00
TheBusyBiscuit
fb636b0d2a
[CI skip] Merge pull request #1169 from J3fftw1/J3fftw1-patch-6
Update SlimefunItems.java
2019-10-07 18:01:00 +02:00
J3fftw1
ca6dac8862
Update SlimefunItems.java 2019-10-07 17:55:21 +02:00
TheBusyBiscuit
e7ed2b6b72 Moved more Items to the new system 2019-10-07 16:09:45 +02:00
TheBusyBiscuit
04d114cd44
Merge pull request #1167 from J3fftw1/master
Added lightning rune to research and gave it its own research
2019-10-07 15:39:35 +02:00
J3fftw1
18846ba0f0
Update ResearchSetup.java 2019-10-07 13:35:27 +02:00
J3fftw1
bea1b4ead6
Update ResearchSetup.java 2019-10-07 08:15:58 +02:00
J3fftw1
3beaf5c99d
Update ResearchSetup.java 2019-10-07 07:59:16 +02:00
TheBusyBiscuit
2044a4e489 Removed debug message 2019-10-06 19:33:34 +02:00
TheBusyBiscuit
0aa989c9fb More performance improvements 2019-10-06 19:32:55 +02:00
TheBusyBiscuit
58889c46d0 Fixes #1162 (also more performance improvements) 2019-10-06 17:04:34 +02:00
TheBusyBiscuit
64bd72a695 Some minor refactoring, also added 2 new recipes to the Crucible 2019-10-06 14:32:06 +02:00
TheBusyBiscuit
3540faa65c More performance improvements 2019-10-06 13:31:57 +02:00
TheBusyBiscuit
dc12ac6e6f Migrated more items to the new system 2019-10-06 00:11:42 +02:00
TheBusyBiscuit
065c9e8f21 Reduced technical debt + Improved Guide Performance 2019-10-05 23:49:25 +02:00
TheBusyBiscuit
da7eff0d87 Added support for all wooden fences in Multiblock structures 2019-10-05 23:49:11 +02:00
TheBusyBiscuit
7800058ed1 Fixes #1157 (Also updated to CS-CoreLib2 v0.6.1) 2019-10-05 22:16:55 +02:00
TheBusyBiscuit
03633fc173
Merge pull request #1160 from TheBusyBiscuit/performance
Improved Performance for Slimefun Armor
2019-10-05 22:06:19 +02:00
TheBusyBiscuit
c0142a6f30 Walshy is a god 2019-10-05 22:02:11 +02:00
TheBusyBiscuit
12efdbd510 Minor sanity changes 2019-10-05 21:51:18 +02:00
TheBusyBiscuit
6797620c2a Hopefully fixed a minor flaw 2019-10-05 21:35:48 +02:00
TheBusyBiscuit
76095333fe A very small performance improvement on radiation. 2019-10-05 21:30:48 +02:00
TheBusyBiscuit
2e77d306e2 Armor Task is now asynchronous 2019-10-05 21:16:21 +02:00
TheBusyBiscuit
9ac4e7eeea Fixed a little mistake 2019-10-05 21:04:42 +02:00
TheBusyBiscuit
6314d7e422 Minor change 2019-10-05 20:49:03 +02:00
TheBusyBiscuit
b07d87fecd Improved Armor Checks 2019-10-05 20:44:11 +02:00
TheBusyBiscuit
b36f9cd3b5 Huge stability and performance improvements (Ticks are skipped upon lag) 2019-10-04 14:19:57 +02:00
TheBusyBiscuit
e772b55e83 Huge stability and performance improvements (Ticks are skipped upon lag) 2019-10-04 14:13:45 +02:00
TheBusyBiscuit
5d1c36734e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-04 14:05:22 +02:00
TheBusyBiscuit
7bbf47639c Ticks may now be skipped if the server is falling behind. 2019-10-04 14:05:16 +02:00
TheBusyBiscuit
561445768d
Merge pull request #1152 from WalshyDev/performance-improvements
Some performance improvements
2019-10-04 14:01:24 +02:00
TheBusyBiscuit
2c9445a971
Merge pull request #1149 from J3fftw1/master
Changed values of sound decaying
2019-10-04 14:01:18 +02:00
Daniel Walsh
5b188bcfaa Merge unmerged items and don't always merge first item 2019-10-04 12:49:23 +01:00
Daniel Walsh
23c39dc81e Thanks :coookie: 2019-10-04 12:40:24 +01:00
Daniel Walsh
a0b4a32fe0 fix typo 2019-10-04 12:39:42 +01:00
Daniel Walsh
fe3cdc6e8d Few more things 2019-10-04 12:38:48 +01:00
Daniel Walsh
8e766f644a CargoNet cleanup 2019-10-04 12:34:15 +01:00
Daniel Walsh
bcb79afc9c TimerTask cleanup 2019-10-04 12:27:24 +01:00
J3fftw1
27521167a8
Update InfusedHopper.java 2019-10-04 13:02:06 +02:00
Daniel Walsh
5ac4920756 Some performance improvements 2019-10-04 11:14:27 +01:00
TheBusyBiscuit
ebed466d69 Some Performance Improvements 2019-10-04 03:29:53 +02:00
TheBusyBiscuit
804bea553b Added Sweet Berry Juice 2019-10-04 03:11:40 +02:00
TheBusyBiscuit
5c40e689e9 Significant performance improvement for items crafted after this build 2019-10-04 02:54:46 +02:00
TheBusyBiscuit
d0329b185d Massive performance improvements for Items created after this build 2019-10-04 02:39:38 +02:00
TheBusyBiscuit
14cf3fee37 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
Conflicts:
	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
2019-10-04 02:21:38 +02:00
TheBusyBiscuit
5566f4b42e
[CI Skip] Merge pull request #1150 from WalshyDev/persistent-data
Persistent data on items
2019-10-04 02:16:16 +02:00
Daniel Walsh
581c2fc65d Changes 2019-10-04 01:14:09 +01:00
TheBusyBiscuit
4a339c6f80 Updated even more staff 2019-10-04 01:57:10 +02:00
Daniel Walsh
31f82b899f move id to SlimefunItemStack 2019-10-04 00:45:51 +01:00