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 1, 2019
2 parents 9006922 + b979b46 commit 132625b
Show file tree
Hide file tree
Showing 35 changed files with 9,208 additions and 6,398 deletions.
57 changes: 57 additions & 0 deletions CHANGELOG-MODS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,60 @@
# 0.2.3 -> 0.3.0

* alib-1.14.4-7.jar
* angelring-1.14.4-1.1.0-pre1.jar
* AppleSkin-mc1.14.4-forge-1.0.13.jar
* BambooBlocksV1.2.8.jar
* BiomesOPlenty-1.14.4-9.0.0.258-universal.jar
* bluepower-1.14.4-0.3.161-alpha-universal.jar
* Bookshelf-1.14.4-4.3.64.jar
* CapabilityProxy-1.14.4-2.1.5.jar
* chemlib-1.14.4-14.jar
* colytra-FORGE-1.14.4-2.1.0.jar
* comforts-FORGE-1.14.4-2.0-beta4.jar
* cosmeticbeds-FORGE-1.14.4-2.0.0.1.jar
* curios-FORGE-1.14.4-1.0.5.4.jar
* cursedearth-1.4a.jar
* CyclopsCore-1.14.4-1.6.1.jar
* DarkUtilities-1.14.4-2.0.4.jar
* dimdungeons-1.02-forge-1.14.4.jar
* engineersdecor-1.14.4-1.0.16-b7.jar
* EverlastingAbilities-1.14.4-1.6.0.jar
* FarmingForBlockheads_1.14.4-5.2.3.jar
* Flopper-1.14.4-1.0.5.jar
* foamdome-2.0.2.jar
* gardentools-1.14.4-1.0.0.jar
* industrial-foregoing-1.14.4-2.1.0-69a4a14.jar
* InventorySpam-1.14.4-1.2.3.jar
* justenoughbeacons-1.1.jar
* LargeFluidTank-14.8.8.jar
* mcjtylib-1.14-3.5.14-alpha.jar
* mcw-bridges-1.0.2-mc1.14.4.jar
* mgui-1.14.4-1.0.1.jar
* minecolonies-0.10.567-ALPHA-universal.jar
* mininggadgets-1.2.3.jar
* modular-routers-1.14.4-5.1.2-7.jar
* Placebo-1.14.4-2.3.5.jar
* refinedstorage-1.7.1.jar
* refinedstorageaddons-0.5.jar
* rftoolsbase-1.14-0.0.11-alpha.jar
* rftoolsbuilder-1.14-1.2.10-alpha.jar
* rftoolspower-1.14-1.2.11-alpha.jar
* rftoolsstorage-1.14-0.0.6-alpha.jar
* rftoolsutility-1.14-1.2.11-alpha.jar
* RingOfAttraction-1.14.4-1.0.19.jar
* RingOfGrowth-1.14.4-1.0.19.jar
* ScreenshotToClipboard-1.14.4-1.0.3.jar
* SilentMechanisms-1.14.4-0.6.9+42.jar
* StevesFactoryManager-1.14.4-3.0.0-alpha21.jar
* structurize-0.10.200-ALPHA.jar
* tetra-1.14.4-1.0.5.jar
* titanium-1.14.4-2.2.9.jar
* watercan-1.14.4-2.1.0.jar
* XaerosWorldMap_1.5.1_Forge_1.14.4.jar
* Xaeros_Minimap_1.19.0_Forge_1.14.4.jar
* xnet-1.14-1.8.4-alpha.jar


# 0.2.2 -> 0.2.3

* mininggadgets-1.2.1.jar
Expand Down
31 changes: 0 additions & 31 deletions config/Dirt2Path.toml

This file was deleted.

2 changes: 2 additions & 0 deletions config/apotheosis/deadly.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ general {


"random spawners" {
# [range: 0 ~ 50, default: 1]
I:"darkutils:wither_slime"=1
I:"druidcraft:beetle"=1
I:"druidcraft:dreadfish"=1
I:"gravestone:player_ghost"=1
Expand Down
1 change: 1 addition & 0 deletions config/apotheosis/spawner.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ spawn_count {
spawn_eggs {
# A list of entity registry names that cannot be applied to spawners via egg. [default: ]
S:"Banned Mobs" <
stoneling
>
}

Expand Down
15 changes: 15 additions & 0 deletions config/appleskin-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

[client]
#If true, shows the hunger (and saturation if showSaturationHudOverlay is true) that would be restored by food you are currently holding
showFoodValuesHudOverlay = true
#If true, shows your food exhaustion as a progress bar behind the hunger bars
showFoodExhaustionHudUnderlay = true
#If true, adds a line that shows your hunger, saturation, and exhaustion level in the F3 debug overlay
showFoodStatsInDebugOverlay = true
#If true, shows the hunger and saturation values of food in its tooltip while holding SHIFT
showFoodValuesInTooltip = true
#If true, shows the hunger and saturation values of food in its tooltip automatically (without needing to hold SHIFT)
showFoodValuesInTooltipAlways = true
#If true, shows your current saturation level overlayed on the hunger bar
showSaturationHudOverlay = true

3 changes: 3 additions & 0 deletions config/bambooblocks-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#Set length of Bamboo Button pulse in seconds
#Range: > 0
ticks = 2
#Set fuel burn time of Bamboo Torches
#Range: > -1
burn_time = 50
#Toggle Reed Thatch
reed_thatch = true
#Set Sensitivity of Bamboo Pressure Plates
Expand Down
19 changes: 19 additions & 0 deletions config/capabilityproxy-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@

[core]

[core.general]
#If an anonymous mod startup analytics request may be sent to our analytics service.
analytics = true
#If the version checker should be enabled.
versionChecker = true
#If the recipe loader should crash when finding invalid recipes.
crashOnInvalidRecipe = false
#If mod compatibility loader should crash hard if errors occur in that process.
crashOnModCompatCrash = false

[block]

[block.ranged_capability_proxy]
#The maximum range in number of blocks. Warning: high values can lag and/or crash your game.
range = 16

21 changes: 0 additions & 21 deletions config/chunk_claim-common.toml

This file was deleted.

2 changes: 2 additions & 0 deletions config/craftingtweaks-client.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@
#State of this addon. Can be ENABLED, BUTTONS_ONLY, HOTKEYS_ONLY or DISABLED.
refinedstorage = "ENABLED"
#State of this addon. Can be ENABLED, BUTTONS_ONLY, HOTKEYS_ONLY or DISABLED.
craftingstation = "ENABLED"
#State of this addon. Can be ENABLED, BUTTONS_ONLY, HOTKEYS_ONLY or DISABLED.
fastbench = "ENABLED"

6 changes: 6 additions & 0 deletions config/curios-client.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@
#The X-Offset for the Curios GUI button
#Range: -100 ~ 100
buttonXOffset = 0
#The Y-Offset for the Creative Curios GUI button
#Range: -100 ~ 100
creativeButtonYOffset = 0
#Set to true to enable rendering curios
renderCurios = true
#The X-Offset for the Creative Curios GUI button
#Range: -100 ~ 100
creativeButtonXOffset = 0
#The Y-Offset for the Curios GUI button
#Range: -100 ~ 100
buttonYOffset = 0
Expand Down
6 changes: 4 additions & 2 deletions config/engineersdecor-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@
without_mob_chair_sitting = false
#Disable rebar concrete and derived blocks.
without_rebar_concrete = false
#Disable directly picking up layers from slabs and slab slices by left clicking while looking up/down.
without_direct_slab_pickup = 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 = ""
#Disable stackable 1/8 block slices.
Expand Down Expand Up @@ -85,8 +83,12 @@

#Miscellaneous settings
[server.miscellaneous]
#Disable directly picking up layers from slabs and slab slices by left clicking while looking up/down.
without_direct_slab_pickup = false
#Enables experimental features. Use at own risk.
with_experimental = false
#Enable that devices are dropped as item also in creative mode, allowing to relocate them with contents and settings.
with_creative_mode_device_drops = false

#Tweaks
[server.tweaks]
Expand Down
22 changes: 11 additions & 11 deletions config/fluidtank-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@

#Recipe settings
[common.recipe]
#Set OreDict name of items to craft Tin tank.
#Set tag name of items to craft Tin tank.
TinOreName = "forge:ingots/tin"
#Set OreDict name of items to craft Stone tank.
#Set tag name of items to craft Stone tank.
StoneOreName = "forge:stone"
#Set OreDict name of items to craft Star tank.
#Set tag name of items to craft Star tank.
StarOreName = "forge:nether_stars"
#Set OreDict name of items to craft Iron tank.
#Set tag name of items to craft Iron tank.
IronOreName = "forge:ingots/iron"
#Set OreDict name of items to craft Bronze tank.
#Set tag name of items to craft Bronze tank.
BronzeOreName = "forge:ingots/bronze"
#Set OreDict name of items to craft Emerald tank.
#Set tag name of items to craft Emerald tank.
EmeraldOreName = "forge:gems/emerald"
#Set OreDict name of items to craft Lead tank.
#Set tag name of items to craft Lead tank.
LeadOreName = "forge:ingots/lead"
#Set OreDict name of items to craft Copper tank.
#Set tag name of items to craft Copper tank.
CopperOreName = "forge:ingots/copper"
#Set OreDict name of items to craft Diamond tank.
#Set tag name of items to craft Diamond tank.
DiamondOreName = "forge:gems/diamond"
#Set OreDict name of items to craft Silver tank.
#Set tag name of items to craft Silver tank.
SilverOreName = "forge:ingots/silver"
#True to use easy recipe.
easyRecipe = false
#Set OreDict name of items to craft Gold tank.
#Set tag name of items to craft Gold tank.
GoldOreName = "forge:ingots/gold"

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

#General settings
[gardentools]

[gardentools.cultivator]
#Range of cultivator item
#Range: 2 ~ 32
range = 9
#Moisture level set by cultivator
#Range: 0 ~ 7
moisture = 7

[gardentools.planter]
#Range of planter item
#Range: 2 ~ 32
range = 9

[gardentools.irrigator]
#Watering radius of irrigation block
#Range: 1 ~ 16
radius = 4

7 changes: 7 additions & 0 deletions config/industrialforegoing/machine-core.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

[MachineCoreConfig]

[MachineCoreConfig.LatexProcessingUnitBlock]
#Power consumed every tick when the machine is working
POWER_CONSUMED_EVERY_TICK = 20

Loading

0 comments on commit 132625b

Please sign in to comment.