Skip to content
This repository has been archived by the owner on Jan 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #222 from wolfkidsounds/4.0.4
Browse files Browse the repository at this point in the history
4.0.4
  • Loading branch information
wolfkidsounds authored Mar 17, 2021
2 parents 7a6a449 + 36a77e7 commit a7ffad0
Show file tree
Hide file tree
Showing 110 changed files with 2,042 additions and 6,473 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ Launcher Exports/Universe Modpack-b4.0.1.zip
Launcher Exports/modlist.html
universe-modpack_b4.0.2.zip
Launcher Exports/Universe Modpack-b4.0.2.zip
universe-modpack_b4.0.3.rar
Launcher Exports/Universe Modpack-b4.0.3.zip
discordintegration/Discord-Integration.cfg
discordintegration/dcintegration-1.1.18-1.12.jar
UniverseModpack.ffs_gui
universe-modpack_b4.0.4.zip
Launcher Exports/Universe Modpack-b4.0.4.zip
36 changes: 36 additions & 0 deletions Client/config/KClearLag.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Configuration file

kclearlagconfig {
# Item whitelist for the ground item clear
# It will not clear any ground items put on this list
# (Caps Specific)
S:GroundItemWhitelist <
Diamond Block
>

# Make this false to disable Items being cleared
B:ItemClear=true

# The Maximum amount of Item Entites in your world before the clear lag kicks in
# It will clear item entities if there is more than this number
I:MaxItemEntities=150

# The Maximum amount of Hostile Entities in your world before the clear lag kicks in
# It will clear Hostile entities if there is more than this number
I:MaxMobs=250

# The Maximum amount of EXP Orb Entites in your world before the clear lag kicks in
# It will clear item entities if there is more than this number
I:MaxXPOrbEntities=999

# Make this false to disable Hostile Mobs being cleared
B:MobClear=true

# Make this false to disable XP Orbs being cleared
B:XPOrbClear=false

# Make this false to completely disable the mod
B:enabled=true
}


27 changes: 27 additions & 0 deletions Client/config/LagGoggles-client.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Configuration file

general {
# If you're colorblind, change this to fit your needs.
# Available options:
# - GREEN_TO_RED
# - BLUE_TO_RED
# - GREEN_TO_BLUE
# Valid values:
# GREEN_TO_RED
# BLUE_TO_RED
# GREEN_TO_BLUE
S:COLORS=GREEN_TO_RED

# Define the number of microseconds at which an object is marked with a deep red colour for WORLD lag.
I:GRADIENT_MAXED_OUT_AT_MICROSECONDS=50

# Define the number of microseconds at which an object is marked with a deep red colour for FPS lag.
I:GRADIENT_MAXED_OUT_AT_NANOSECONDS_FPS=100000

# What is the minimum amount of microseconds required before an object is tracked in the client?
# This is only for WORLD lag.
# This also affects the analyze results window
I:MINIMUM_AMOUNT_OF_MICROSECONDS_THRESHOLD=50
}


41 changes: 41 additions & 0 deletions Client/config/LagGoggles-server.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Configuration file

general {
# Allow normal users to see event subscribers?
B:ALLOW_NON_OPS_TO_SEE_EVENT_SUBSCRIBERS=false

# What is the maximum HORIZONTAL range in blocks normal users can get results for?
D:NON_OPS_MAX_HORIZONTAL_RANGE=50.0

# If normal users can start the profiler, what is the maximum time in seconds?
I:NON_OPS_MAX_PROFILE_TIME=20

# What is the maximum VERTICAL range in blocks normal users can get results for?
D:NON_OPS_MAX_VERTICAL_RANGE=20.0

# If normal users can start the profiler, what is the cool-down between requests in seconds?
I:NON_OPS_PROFILE_COOL_DOWN_SECONDS=120

# How often can normal users request the latest scan result in seconds?
I:NON_OPS_REQUEST_LAST_SCAN_DATA_TIMEOUT=30

# From where should we range-limit blocks vertically for normal users?
# This will override the MAX_VERTICAL_RANGE when the block is above this Y level
I:NON_OPS_WHITELIST_HEIGHT_ABOVE=64

# What's the permission level available to non-operators (Normal players)?
# Please note that this ONLY works on dedicated servers. If you're playing singleplayer or LAN, the FULL permission is used.
# Available permissions in ascending order are:
# 'NONE' No permissions are granted, all functionality is denied.
# 'GET' Allow getting the latest scan result, this will be stripped down to the player's surroundings
# 'START' Allow starting the profiler
# 'FULL' All permissions are granted, teleporting to entities, blocks
# Valid values:
# NONE
# GET
# START
# FULL
S:NON_OP_PERMISSION_LEVEL=NONE
}


8 changes: 4 additions & 4 deletions Client/config/MatterOverdrive/MatterOverdrive.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,10 @@ entities {
##########################################################################################################

"matter registry" {
B:"automatic matter calculation from furnace"=false
B:"automatic matter calculation from inscriber"=false
B:"automatic matter calculation from recipe"=false
B:automatic_calculation=false
B:"automatic matter calculation from furnace"=true
B:"automatic matter calculation from inscriber"=true
B:"automatic matter calculation from recipe"=true
B:automatic_calculation=true
S:blacklist <
>
S:mod_blacklist <
Expand Down
9 changes: 9 additions & 0 deletions Client/config/TickCentral/config.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# TickCentral config
# For you, this is only really needed to access debug settings
# As this is a library, there is generally no need to modify these settings
SHOW_FORCED_LOADING = false
DEBUG = false

# This library is capable of caching classes. This number is used to track if we should
# re-run the scanner. You can also manually trigger it by setting it to 0.
FILE_COUNT = 0
8 changes: 4 additions & 4 deletions Client/config/atum.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ mobs {
}

brigand {
I:max=3
I:min=2
I:max=2
I:min=1
I:weight=30
}

nomad {
I:max=4
I:max=3
I:min=1
I:weight=22
I:weight=28
}

bonestorm {
Expand Down
52 changes: 4 additions & 48 deletions Client/config/avatar/mobs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
IGNORE_CONFIG_FILE: false

bisonBreedMaxMinutes: 120.0
bisonBreedMinMinutes: 60.0
bisonBreedMaxMinutes: 400.0
bisonBreedMinMinutes: 120.0
bisonChestTameness: 1000
bisonFoods:
minecraft:sugar: 2
Expand All @@ -25,51 +25,7 @@ bisonMinDomestication: 500
bisonOwnableTameness: 900
bisonRideOneSecondTameness: 3
bisonRiderTameness: 800
maxNumberOfBenders: 3
maxNumberOfBenders: 0
scrollDropChance:
zombie_pigman: 1.0
chicken: 1.0
stray: 1.0
wither_skeleton: 1.0
elder_guardian: 1.0
magma_cube: 1.0
polar_bear: 1.0
skeleton: 1.0
bat: 1.0
husk: 1.0
blaze: 1.0
mooshroom: 1.0
cave_spider: 1.0
silverfish: 1.0
zombie: 1.0
witch: 1.0
squid: 1.0
guardian: 1.0
ghast: 1.0
parrot: 1.0
spider: 1.0
sheep: 1.0
creeper: 1.0
enderman: 1.0
scrollTradeItems:
minecraft:gold_ingot: 1
minecraft:emerald: 1
minecraft:diamond: 1
scrollType:
zombie_pigman: fire
stray: ice
wither_skeleton: fire
elder_guardian: water
magma_cube: fire
polar_bear: water
skeleton: earth
bat: air
husk: sand
blaze: fire
cave_spider: earth
silverfish: earth
zombie: earth
guardian: water
ghast: fire
spider: earth
creeper: combustion
scrollType:
2 changes: 1 addition & 1 deletion Client/config/bbm/AI_Improvements.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ general {
B:RemoveEntityAILookIdle=true

# Disabled the AI segment that controls entities looking at the closest player [default: false]
B:RemoveEntityAIWatchClosest=false
B:RemoveEntityAIWatchClosest=true

# Replaces the EntityLookHelper with a more CPU efficient version [default: true]
B:ReplaceLookHelper=true
Expand Down
Loading

0 comments on commit a7ffad0

Please sign in to comment.