mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
1,712 Commits 1 Branch 0 Tags 64 MiB
8e72577974
Commit Graph

1353 Commits

Author SHA1 Message Date
TheBusyBiscuit
40616ee47e
Merge pull request #1239 from TheBusyBiscuit/custom-textures 
Added support for custom item models
 2019-11-10 18:52:36 +01:00
TheBusyBiscuit
97d8ce1546 Moved CoreProtect integration to CS-CoreLib2 2019-11-10 18:52:18 +01:00
TheBusyBiscuit
3e30ce8d14 Reduced technical debt 2019-11-10 18:43:37 +01:00
TheBusyBiscuit
2459469c9d Added support for custom item models 2019-11-10 17:46:18 +01:00
TheBusyBiscuit
2c7e155aa1 Added different kinds of Jerky to the Auto-Drier 2019-11-10 13:51:56 +01:00
TheBusyBiscuit
25f8566196
Merge pull request #1222 from AlexLander123/fixes 
Changed method of accessing reactor from access port
 2019-11-10 13:01:19 +01:00
TheBusyBiscuit
fc67fac34c [CI skip] Changed default version string 2019-11-10 13:01:07 +01:00
AlexLander123
c13ec9903c Ancient altar no longer able to craft items that are not unlocked 2019-11-06 02:17:52 +08:00
AlexLander123
9442fa65ca Fixed ancient alter logic 2019-11-06 00:56:03 +08:00
AlexLander123
e4efed0640 Made requested changes 
- Added null check
- Changed "a access port" to "the access port"
- Removed extra menu.open(p)
 2019-11-06 00:08:25 +08:00
SoSeDiK
2fb92c5083 Update GPSNetwork.java 2019-11-04 16:36:10 +02:00
SoSeDiK
0302810c9c Replaced double with int 2019-11-04 16:33:40 +02:00
SoSeDiK
09c02b7848 Fixed transmitter locations 2019-11-04 16:28:12 +02:00
TheBusyBiscuit
8895beb83a [CI skip] Minor refactoring 2019-11-03 23:43:11 +01:00
TheBusyBiscuit
57da6db9be Reduced technical debt and improved talisman performance 2019-11-03 21:32:44 +01:00
TheBusyBiscuit
a1e47d5ce0 Many bug fixes, many guide improvements 2019-11-03 20:36:46 +01:00
TheBusyBiscuit
27019c9ceb Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 20:28:35 +01:00
TheBusyBiscuit
6a1b6ffd92 Added support for ALL Vanilla Recipes (+ Faster Guide Responses) 2019-11-03 20:28:25 +01:00
Daniel Walsh
2febbe4d1c order 2019-11-03 19:05:32 +00:00
Daniel Walsh
d88291e215 Bring across repair cost in the disenchanter 2019-11-03 19:03:55 +00:00
TheBusyBiscuit
d86cb5e5b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 19:23:39 +01:00
TheBusyBiscuit
fc6bd05b4f
[CI skip] Merge pull request #1223 from J3fftw1/good/fix/yes/yes 
Fixes
 2019-11-03 19:23:19 +01:00
TheBusyBiscuit
beebbda2dd Fixes #1224 2019-11-03 19:20:22 +01:00
TheBusyBiscuit
5c860cbfa4 Fixes #1226 2019-11-03 19:20:12 +01:00
J3fftw1
cade8df053 Fixes #1219 2019-10-31 16:24:27 +01:00
AlexLander123
6dd56e23f2 Changed method of accessing reactor from access port 
The change is made to stop inventory.no-access message when opening access port due to canOpen(Block, Player) returning false
 2019-10-31 22:01:53 +08:00
TheBusyBiscuit
05858309c5 [CI skip] Reduced technical debt 2019-10-29 09:13:32 +01:00
TheBusyBiscuit
7ba0eba4e9 Fixes #1211 2019-10-28 14:53:54 +01:00
AlexLander123
8601986c09 Allow reactors to take in fuel from access port 
- Also allow reactors to take in fuel in bulk
 2019-10-28 04:02:06 +08:00
TheBusyBiscuit
9f3c3a413b Some optimizations, also changed /sf timings to use floating point times 2019-10-27 20:07:12 +01:00
TheBusyBiscuit
e036e0f756 Fixes #1206 2019-10-27 14:18:31 +01:00
TheBusyBiscuit
bf4991264b Migrated more Items to the new System (+ Added auto-migration) 2019-10-27 14:38:39 +01:00
TheBusyBiscuit
57e1126553 Optimized and cleaned up guide 2019-10-20 16:41:28 +02:00
TheBusyBiscuit
1c12b892fe
Merge pull request #1203 from J3fftw1/veinminerfix 
fixes #1202
 2019-10-20 14:25:25 +02:00
J3fftw1
852b4bfc2a fixes #1202 2019-10-20 14:19:27 +02:00
TheBusyBiscuit
ad3ca513ad Fixed Multi Tools 2019-10-19 19:06:38 +02:00
TheBusyBiscuit
783a66d2da Fixed Food 2019-10-19 18:20:08 +02:00
TheBusyBiscuit
bb2d9d851f Fixes #1153 2019-10-19 18:18:17 +02:00
TheBusyBiscuit
41811b90f1 [CI skip] Added some documentation to the code 2019-10-19 16:48:22 +02:00
TheBusyBiscuit
a3bf63a023 More optimizations (+ Added more Jerky Meat) 2019-10-19 16:16:40 +02:00
TheBusyBiscuit
3eed8cebc6 Another fix 2019-10-19 15:15:11 +02:00
TheBusyBiscuit
70cc1d04f4 Fixes #1196 2019-10-19 15:14:05 +02:00
TheBusyBiscuit
c5341a6b02 Fixes #1196 2019-10-19 15:04:45 +02:00
TheBusyBiscuit
fc7c4e4d81 Fixed #1200 2019-10-19 12:53:13 +02:00
TheBusyBiscuit
260c3a51dd More code cleanup (+ Added Sweet Berries Organic Food/Fertilizer) 2019-10-19 10:30:15 +02:00
AlexLander123
1dc669740c Allow /sf cheat to have all categories unlocked 
- If the player who who is using /sf cheat have not unlocked the category, they will still have access to it
- Removed empty code
 2019-10-18 21:27:28 +08:00
J3fftw1
576b297b50 Fixed ExplosivePickaxe 2019-10-18 00:15:48 +02:00
J3fftw1
470f5f1afe fixed requested changes 2019-10-17 23:23:25 +02:00
J3fftw1
10fe7238ad fixed broken items 2019-10-17 23:14:43 +02:00
TheBusyBiscuit
06e3125a6d Repositioned back button for guide search 2019-10-17 01:33:49 +02:00
TheBusyBiscuit
f71b925a41 Improved Guide Search 2019-10-17 01:27:00 +02:00
TheBusyBiscuit
ee6dfae045 Fixed Guide Search's back button 2019-10-17 01:21:04 +02:00
TheBusyBiscuit
5fa021469f Added a logging message 2019-10-17 01:12:47 +02:00
TheBusyBiscuit
07827ecc53 Moved Guide History to Player Profiles 2019-10-17 01:08:14 +02:00
TheBusyBiscuit
45a688e148 Added wiki pages to the guide 2019-10-17 00:49:55 +02:00
TheBusyBiscuit
18b5bda4a8 [CI skip] Introduced proper Maven structure 2019-10-17 00:37:46 +02:00
TheBusyBiscuit
20e3f2b9ce Some more bug fixes and optimizations 2019-10-14 20:50:57 +02:00
TheBusyBiscuit
7e0eb29040 Minor optimization 2019-10-14 17:58:15 +02:00
TheBusyBiscuit
b2fd914cee Fixed Backpacks 2019-10-14 17:18:37 +02:00
TheBusyBiscuit
6865ab8c6c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-14 17:18:08 +02:00
TheBusyBiscuit
fef43314f9 Fixed Backpacks not working 2019-10-14 17:17:50 +02:00
TheBusyBiscuit
fb652fe41d Another fix 2019-10-14 09:54:23 +02:00
TheBusyBiscuit
2a475811de Fixes #1180 (+ Improvements on MultiTool performance) 2019-10-14 09:31:14 +02:00
creator3
9551bf5a5c
Fix major BlockStorage performance regression 2019-10-13 19:01:00 -04:00
TheBusyBiscuit
090f45d93f
Merge pull request #1176 from WalshyDev/qol/improved-timings 
Order timings
 2019-10-13 19:05:16 +02:00
TheBusyBiscuit
005fbbdd13 Minor changes and optimizations 2019-10-13 19:05:04 +02:00
Daniel Walsh
d2e1dabf47 okie 2019-10-13 17:45:54 +01:00
TheBusyBiscuit
3239616f50 Hotfix 2 2019-10-13 18:44:59 +02:00
Daniel Walsh
8b4d927753 Fix NPE 2019-10-13 17:33:58 +01:00
Daniel Walsh
22a9f8955a Improve and also order console output 2019-10-13 17:32:42 +01:00
TheBusyBiscuit
a1e55d0d92 Hotfix 2019-10-13 18:26:18 +02:00
TheBusyBiscuit
2fc05354a0 Some more optimizations 2019-10-13 18:14:25 +02:00
Daniel Walsh
5c5214beba Fix 2 2019-10-13 17:06:45 +01:00
TheBusyBiscuit
e0d1a71453 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-13 16:37:28 +02:00
TheBusyBiscuit
819a59d3a4 [CI skip] Micro-optimizations 2019-10-13 16:37:13 +02:00
Daniel Walsh
c17d4f5afc fix dat 2019-10-13 15:25:57 +01:00
TheBusyBiscuit
a2fe40cfe1
Merge pull request #1174 from WalshyDev/async-player-profile-fetch 
Implement PlayerProfile async fetch
 2019-10-13 15:57:02 +02:00
TheBusyBiscuit
b76a7a3e24
[CI skip] Merge pull request #1175 from AlexLander123/fixes 
Fixed NullPointerException when using Pickaxe of the Seeker
 2019-10-13 15:56:24 +02:00
AlexLander123
b95b3d2bf4 Logic Correction for PickaxeOfTheSeeker 2019-10-13 21:01:15 +08:00
Daniel Walsh
7c46affc9a Order timings 2019-10-13 13:42:07 +01:00
AlexLander123
d2581c625d Performance improvement 
Changed distance() to distanceSquared()
 2019-10-13 19:36:02 +08:00
TheBusyBiscuit
d3b3fd15bd Very small performance optimizations 2019-10-13 13:24:14 +02:00
Daniel Walsh
c128ba872d *yawn* 2019-10-13 12:15:45 +01:00
AlexLander123
75d568c2dd Fixed NullPointerException 
Fixed NullPointerException when using Pickaxe of the Seeker
 2019-10-13 16:39:01 +08:00
Daniel Walsh
694d36afa6 General improvements and fixes 2019-10-11 23:56:51 +01:00
Daniel Walsh
6b62a45ffa Added opening messages to locale 2019-10-11 23:11:02 +01:00
TheBusyBiscuit
f62bdf92c0 [CI skip] Little optimization 2019-10-12 00:05:44 +02:00
TheBusyBiscuit
1c7639717e Added /sf search 2019-10-11 23:54:20 +02:00
Daniel Walsh
8cb37a1850 Implement PlayerProfile async fetch 2019-10-11 22:48:46 +01:00
AlexLander123
5d107de6ac Readded hasItemMeta() check 2019-10-10 00:14:02 +08:00
AlexLander123
8b8486a2e7 Clarification of code 2019-10-09 22:47:33 +08:00
AlexLander123
691256cefe Added hasDisplayName check 2019-10-09 22:06:31 +08:00
AlexLander123
8cc822429d Allow BlockPlacer to place blocks while retaining certain data 
BlockPlacer will set block's name and inventory according to its itemstack.
 2019-10-09 21:49:02 +08:00
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
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
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
Daniel Walsh
db0ed1a46b I want a cookie! 2019-10-04 00:31:47 +01:00
Daniel Walsh
3255269e2b Small fix 2019-10-04 00:29:46 +01:00
TheBusyBiscuit
4a2ca7599b Further updates 2019-10-04 01:25:19 +02:00
TheBusyBiscuit
49f1247b13 Removed unused Heavy Armor 2019-10-04 01:21:30 +02:00
Daniel Walsh
160f471445 Implement persistent data to getByItem and isItem 2019-10-04 00:20:36 +01:00
TheBusyBiscuit
4882a97ff5 Updated some outdated stuff 2019-10-04 01:02:51 +02:00
Daniel Walsh
9ba54a79cf Implement persistent ID 2019-10-03 23:37:13 +01:00
Daniel Walsh
2d8cb7c30b Some constructor cleanup 2019-10-03 22:58:48 +01:00
J3fftw1
9aab707291
Update MagnetTask.java 2019-10-03 23:08:41 +02:00