Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Dec 30, 2019
2 parents 9426979 + ed4a838 commit 81871bd
Show file tree
Hide file tree
Showing 16 changed files with 3,482 additions and 3,047 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,4 @@ CHANGELOG-GENERATED.md
stdlib_Result$Error.class
stdlib_Result$Ok.class
ttt.class
.persistent/multibeds/embroidery.dat
22 changes: 22 additions & 0 deletions CHANGELOG-MODS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# 0.4.0 -> 0.4.1

* Botania r1.11-373.jar
* CookingForBlockheads_1.14.4-7.4.2.jar
* CraftingTweaks_1.14.4-10.1.5.jar
* DefaultOptions_1.14.4-10.2.7.jar
* engineersdecor-1.14.4-1.0.18-b1.jar
* FarmingForBlockheads_1.14.4-5.3.1.jar
* KleeSlabs_1.14.4-7.4.8.jar
* multibeds-1.14-1.5.1.jar
* NaturesCompass-1.14.4-1.8.1.jar
* PackingTape-1.14.4-0.9.1.jar
* Patchouli-1.1-24.jar
* Quark-r2.0-208.jar
* refinedstorage-1.7.3.jar
* rsgauges-1.14.4-1.2.0-b1.jar
* shetiphiancore-1.14-3.6.0.jar
* SilentMechanisms-1.14.4-0.6.10+43.jar
* TMechworks-1.14.4-2.0.1.jar
* tombstone-4.1.8-1.14.4.jar
* TOOLKIT-1.4.2.jar

# 0.3.7 -> 0.4.0

* Botania r1.11-372.jar
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## [Enigmatica 4 v0.4.1](https://github.com/NillerMedDild/Enigmatica4/tree/0.4.1)
*Forge-1.14.4-28.1.109*

**Changes**

- Removed the Draw Bridge mod and it's library mod

**Fixed bugs**

-

## [Enigmatica 4 v0.4.0](https://github.com/NillerMedDild/Enigmatica4/tree/0.4.0)
*Forge-1.14.4-28.1.109*

Expand Down
35 changes: 35 additions & 0 deletions config/Tinkers Mechworks/Config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

[world]
#Whether world generation is enabled as a whole
enabled = false

[world.copper]
#A list of fully qualified biome names, for example "minecraft:river"
filter = []
#If true, the filter will act as a whitelist, otherwise, blacklist
isWhitelist = false
#Whether or not this ore is generated
enabled = true

[world.aluminum]
#A list of fully qualified biome names, for example "minecraft:river"
filter = []
#If true, the filter will act as a whitelist, otherwise, blacklist
isWhitelist = false
#Whether or not this ore is generated
enabled = true

[drawbridge]
#The base delay between each block place/destroy
#Range: 0.0 ~ 2.147483647E9
delay = 0.5
#The distance that the base drawbridge can extend
#Range: 1 ~ 64
extendLength = 16
#How much each distance upgrade increases the max distance by
#Range: 0 ~ 64
extendUpgradeValue = 16
#The amount by which each speed upgrade decreases the delay
#Range: 0.0 ~ 2.147483647E9
speedUpgradeValue = 0.1

2 changes: 2 additions & 0 deletions config/engineersdecor-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
without_factory_dropper = false
#Disable slag bricks and derived blocks.
without_slag_bricks = false
#Disable the small tree cutter.
without_tree_cutter = false
#Disable treated wood window, etc.
without_windows = false
#Disable item disposal/trash/void incinerator device.
Expand Down
1 change: 1 addition & 0 deletions config/farmingforblockheads/MarketRegistry.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
10 changes: 10 additions & 0 deletions config/multibeds-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

#Select A GUI Style
[gui_style]
#Allowed Values: DEFAULT, VANILLA
"Embroidery Thread" = "DEFAULT"
#Allowed Values: DEFAULT, VANILLA
"Bed/Ladder Builder" = "DEFAULT"
#Allowed Values: DEFAULT, VANILLA
"Blanket Loom" = "DEFAULT"

13 changes: 13 additions & 0 deletions config/naturescompass-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

[Client]
#Displays Nature's Compass information even while chat is open.
displayWithChatOpen = true
#Fixes biome names by adding missing spaces. Ex: ForestHills becomes Forest Hills
fixBiomeNames = true
#The line offset for information rendered on the HUD.
#Range: 0 ~ 50
overlayLineOffset = 1
#The side for information rendered on the HUD. Ex: LEFT, RIGHT
#Allowed Values: LEFT, RIGHT
overlaySide = "LEFT"

16 changes: 16 additions & 0 deletions config/naturescompass-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

[General]
#Allows a player to teleport to a located biome when in creative mode, opped, or in cheat mode.
allowTeleport = true
#biomeSize * radiusModifier = maxSearchRadius. Raising this value will increase search accuracy but will potentially make the process more resource .
#Range: 0 ~ 1000000
radiusModifier = 2500
#biomeSize * sampleSpaceModifier = sampleSpace. Lowering this value will increase search accuracy but will make the process more resource intensive.
#Range: 0 ~ 1000000
sampleSpaceModifier = 16
#A list of biomes that the compass will not be able to search for. Specify by resource location (ex: minecraft:ocean) or ID (ex: 0)
biomeBlacklist = []
#The maximum number of samples to be taken when searching for a biome.
#Range: 0 ~ 1000000
maxSamples = 50000

6 changes: 6 additions & 0 deletions config/quark-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
"Enable Chorus Fruit Block" = true
"Enable Blaze Lantern" = true
"Enable Bamboo Block" = true
"Enable Berry Sack" = true
"Enable Golden Apple Crate" = true
"Enable Sugar Cane Block" = true
"Blaze Lantern Fuel Time" = 24000
Expand Down Expand Up @@ -260,6 +261,7 @@
"Enhanced Ladders" = true
"Snow Golem Player Heads" = true
"Glass Shard" = false
"Campfires Boost Elytra" = true

[tweaks.sign_editing]
"Requires Empty Hand" = true
Expand Down Expand Up @@ -335,6 +337,10 @@
"Enable End" = true
"Enable Clock Nerf" = true

[tweaks.campfires_boost_elytra]
"Boost Strength" = 0.5
"Max Speed" = 1.0

[vanity]
"Color Runes" = true
Emotes = true
Expand Down
85 changes: 85 additions & 0 deletions config/rsgauges-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@

#Settings affecting the logical server side, but are also configurable in single player.
[server]

#Opt-out settings
[server.optout]
#Disables switch remote linking.
without_switch_linking = false
#Completely disable all (button like) pulse switches.
without_pulse_switches = false
#Disable the 'no output' config option for switches.
without_switch_nooutput = false
#Disables the possibility to right click switches with Redstone Dust, Ender Pearls or Switch Link pearls for configuration or linking. Can be useful if it is important to the players that no unforseen switch configuration happens when activating a switch was intended. Affects server side only. Can be changed during operation.
without_rightclick_item_switchconfig = false
#Disable color tinting for switches and gauges.
without_color_tinting = false
#Opt-out any block by its registry name ('*' wildcard matching, comma separated list, whitespaces ignored. You must match the whole name, means maybe add '*' also at the begin and end. Example: '*wood*,*steel*' excludes everything that has 'wood' or 'steel' in the registry name. The matching result is also traced in the log file.
pattern_excludes = ""
#Completely disable all blinking indicator lamps/LEDs.
without_blinking_indicators = false
#Prevent blocks from being opt'ed by registry name ('*' wildcard matching, comma separated list, whitespaces ignored. Evaluated before all other opt-out checks. You must match the whole name, means maybe add '*' also at the begin and end. Example: '*wood*,*steel*' includes everything that has 'wood' or 'steel' in the registry name.The matching result is also traced in the log file.
pattern_includes = ""
#Completely disable all sound emmitting indicators.
without_sound_indicators = false
#Completely disable all (blinking and steady) indicator lamps/LEDs.
without_indicators = false
#Completely disable all automatic switches.
without_automatic_switches = false
#Completely disable all link relay switches.
without_linkrelay_switches = false
#Completely disable all contact switches.
without_contact_switches = false
#Disable pulse time configuration of switches using redstone dust stack clicking.
without_pulsetime_config = false
#Completely disable all (power metering) gauges.
without_gauges = false
#Completely disable all (lever like) bistable switches.
without_bistable_switches = false
#Completely disable all decorative blocks.
without_decorative = false
#Disable all internal recipes, allowing to use alternative pack recipes.
without_recipes = false

#Miscellaneous settings
[server.miscellaneous]
#Disable the status overlay for switches and use chat messages instead.
without_switch_status_overlay = false
#Enables experimental features. Use at own risk.
with_experimental = false
#Disable tile entity update() for time based switches.(for performance testing only, don't do this at home)
without_timer_switch_update = false
#Comma sepatated list of items names that can be used alter configurable blocks of this mod. This applies when the display side of the block is right click (activated) with the item in the main hand.
accepted_wrenches = "redstone_torch"
#Disable tile entity update() for environmental sensor switches.
#(for performance testing only, don't do this at home)
without_environmental_switch_update = false
#Disable tile entity update() for detector switches(for performance testing only, don't do this at home).
without_detector_switch_update = false
#Defines how far you or a link source switch can be away from the target to activate it. The value 0 means 'no limitation'.
#Range: 4 ~ 64
max_switch_linking_distance = 48

#Settings to tweak the performance, or use cases normally no change should be required here.
[server.tweaks]
#Sample interval of the gauges in ticks. Lower values decrease the display latency for indirect weak power measurements. Minor performance impact for values >= 5.
#Range: 2 ~ 100
gauge_update_interval = 8
#Sample interval of the linear switches in ticks (like laser pointer based sensors). Lower values make the switches reacting faster, but also have an impact on the server performance due to ray tracing. Has much less impact
#as the volumetric autoswitch interval.
#Range: 1 ~ 50
autoswitch_linear_update_interval = 4
#Timeout in milliseconds defining the timeout for left clicking switches or devices in order to configure them. If the device can be opened, it will be opened on 'double-left-click' and closed again on 'single-left-click'. The item in the hand must be a valid wrench (see 'Accepted wrenches'). For switches/devices that cannot be opened, multi-clicking cycles through the configuration options. The block has to be at least clicked two times withing the timeout to differ configuration from block breaking, and prevent misconfiguration on unintended left-clicking.
#Range: 500 ~ 1200
config_left_click_timeout = 700
#Sample interval of volume sensing automatic switches in ticks (e.g infrared motion detector). Lower values make the switches reacting faster, but also have an impact on the server performance due to ray tracing.
#Range: 5 ~ 50
autoswitch_volumetric_update_interval = 10
#Vertial position of the switch status overlay message.
#Range: 0.1 ~ 0.8
switch_status_overlay_y = 0.75
#Disable CTRL-SHIFT item tooltip display.
without_tooltips = false
#Gauges shall not frequently lookup weak power provided to the block they are attached to.
without_gauge_weak_power_measurement = false

Loading

0 comments on commit 81871bd

Please # to comment.