diff --git a/CHANGELOG.md b/CHANGELOG.md index e31ef14..931dfce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ -2.20.0+214 +2.21.0+216 -• update mod Aroma Backup S3 -• update mod Lib Nine +• add mod HWYLA -• update config Aroma Backup S3 +• add config HWYLA + +• update dependency Forge + +• update mod Floralis + +• fix #1 diff --git a/config/waila/theme/dark.json b/config/waila/theme/dark.json new file mode 100644 index 0000000..3683991 --- /dev/null +++ b/config/waila/theme/dark.json @@ -0,0 +1,7 @@ +{ + "name": "cfg.theme.dark", + "background": "#131313", + "gradientTop": "#383838", + "gradientBottom": "#242424", + "font": "#A0A0A0" +} \ No newline at end of file diff --git a/config/waila/theme/vanilla.json b/config/waila/theme/vanilla.json new file mode 100644 index 0000000..29864f6 --- /dev/null +++ b/config/waila/theme/vanilla.json @@ -0,0 +1,7 @@ +{ + "name": "cfg.theme.vanilla", + "background": "#100010", + "gradientTop": "#5000FF", + "gradientBottom": "#28007F", + "font": "#A0A0A0" +} \ No newline at end of file diff --git a/config/waila/waila.cfg b/config/waila/waila.cfg new file mode 100644 index 0000000..59aa148 --- /dev/null +++ b/config/waila/waila.cfg @@ -0,0 +1,155 @@ +# Configuration file + +client { + # The amount of time in milliseconds (1000ms = 1s) between queries to the server for Tile Entity and Entity data. There is an enforced minimum of 250 (or every 1/4 of a second). + I:waila.cfg.ratelimiter=250 +} + + +general { + I:waila.cfg.alpha=0 + I:waila.cfg.bgcolor=1048592 + S:waila.cfg.blocknameformat=\u00A7f%s + S:waila.cfg.entitynameformat=\u00A7f%s + S:waila.cfg.fluidnameformat=\u00A7f%s + I:waila.cfg.fontcolor=10526880 + I:waila.cfg.gradient1=5243135 + I:waila.cfg.gradient2=2621567 + I:waila.cfg.heartsperline=20 + B:waila.cfg.hidefromdebug=true + B:waila.cfg.hidefromlist=true + B:waila.cfg.keybind=true + B:waila.cfg.liquid=true + I:waila.cfg.maxhpbeforetext=20 + B:waila.cfg.metadata=false + S:waila.cfg.metadataformat=\u00A77[%s@%d] + S:waila.cfg.modnameformat=\u00A79\u00A7o%s + B:waila.cfg.newfilters=true + I:waila.cfg.posx=5000 + I:waila.cfg.posy=100 + I:waila.cfg.scale=100 + B:waila.cfg.shiftblock=false + B:waila.cfg.shiftents=false + B:waila.cfg.show=true + B:waila.cfg.showitem=true + B:waila.cfg.showmode=true + B:waila.cfg.tts=false +} + + +########################################################################################################## +# modules +#--------------------------------------------------------------------------------------------------------# +# Those are the config keys defined in modules. +# Server side, it is used to enforce keys client side using the next section. +########################################################################################################## + +modules { + B:capability.energyinfo=true + B:capability.inventoryinfo=true + B:capability.tankinfo=true + B:display.content=true + B:display.stacklimit=true + B:display.status=true + B:emc.shiftToggle=false + B:fluidtank.waila.shortinfo=true + B:fluidtank.waila.tankinfo=true + B:general.showcrop=true + B:general.showents=true + B:general.showhp=true + B:general.showstates=false + B:harvestability.currentlyharvestable=true + B:harvestability.currentlyharvestable.sneakingonly=false + B:harvestability.effectivetool=true + B:harvestability.effectivetool.sneakingonly=false + B:harvestability.harvestlevel=true + B:harvestability.harvestlevel.sneakingonly=false + B:harvestability.harvestlevelnum=true + B:harvestability.harvestlevelnum.sneakingonly=false + B:harvestability.minimal=true + B:harvestability.oresonly=false + B:harvestability.shearability=true + B:harvestability.shearability.sneakingonly=false + B:harvestability.silktouchability=true + B:harvestability.silktouchability.sneakingonly=false + B:harvestability.toolrequiredonly=false + B:harvestability.unharvestableonly=false + B:jade.brewingstand=true + B:jade.horsechest=true + B:jade.horsestat=true + B:jade.itemframe=true + B:jade.mobbreeding=true + B:jade.mobgrowth=true + B:jade.potioneffects=true + B:tconstruct.casting=true + B:tconstruct.progress=true + B:tconstruct.tank=true + B:vanilla.comparator=true + B:vanilla.furnacedisplay=true + B:vanilla.jukebox=true + B:vanilla.leverstate=true + B:vanilla.redstone=true + B:vanilla.repeater=true + B:vanilla.silverfish=true + B:vanilla.spawntype=true +} + + +########################################################################################################## +# server_forcing +#--------------------------------------------------------------------------------------------------------# +# Any key set to true here will ensure that the client is using the configuration set in the 'module' section above. +# This is useful for enforcing false to 'cheating' keys like silverfish. +########################################################################################################## + +server_forcing { + B:capability.energyinfo=false + B:capability.inventoryinfo=false + B:capability.tankinfo=false + B:display.content=false + B:display.stacklimit=false + B:display.status=false + B:emc.shiftToggle=false + B:fluidtank.waila.shortinfo=false + B:fluidtank.waila.tankinfo=false + B:general.showcrop=false + B:general.showents=false + B:general.showhp=false + B:general.showstates=false + B:harvestability.currentlyharvestable=false + B:harvestability.currentlyharvestable.sneakingonly=false + B:harvestability.effectivetool=false + B:harvestability.effectivetool.sneakingonly=false + B:harvestability.harvestlevel=false + B:harvestability.harvestlevel.sneakingonly=false + B:harvestability.harvestlevelnum=false + B:harvestability.harvestlevelnum.sneakingonly=false + B:harvestability.minimal=false + B:harvestability.oresonly=false + B:harvestability.shearability=false + B:harvestability.shearability.sneakingonly=false + B:harvestability.silktouchability=false + B:harvestability.silktouchability.sneakingonly=false + B:harvestability.toolrequiredonly=false + B:harvestability.unharvestableonly=false + B:jade.brewingstand=false + B:jade.horsechest=false + B:jade.horsestat=false + B:jade.itemframe=false + B:jade.mobbreeding=false + B:jade.mobgrowth=false + B:jade.potioneffects=false + B:tconstruct.casting=false + B:tconstruct.progress=false + B:tconstruct.tank=false + B:vanilla.comparator=false + B:vanilla.furnacedisplay=false + B:vanilla.jukebox=false + B:vanilla.leverstate=false + B:vanilla.redstone=false + B:vanilla.repeater=false + B:vanilla.silverfish=false + B:vanilla.spawntype=false +} + + diff --git a/forge-1.12.2-14.23.5.2855-universal.jar b/forge-1.12.2-14.23.5.2860-universal.jar similarity index 93% rename from forge-1.12.2-14.23.5.2855-universal.jar rename to forge-1.12.2-14.23.5.2860-universal.jar index 45e9937..b06cd54 100644 Binary files a/forge-1.12.2-14.23.5.2855-universal.jar and b/forge-1.12.2-14.23.5.2860-universal.jar differ diff --git a/mods/Floralis-1.12.2-1.9.0.jar b/mods/Floralis-1.12.2-1.10.0.jar similarity index 78% rename from mods/Floralis-1.12.2-1.9.0.jar rename to mods/Floralis-1.12.2-1.10.0.jar index 5bbe224..69bfa1c 100644 Binary files a/mods/Floralis-1.12.2-1.9.0.jar and b/mods/Floralis-1.12.2-1.10.0.jar differ diff --git a/mods/Hwyla-1.8.26-B41_1.12.2.jar b/mods/Hwyla-1.8.26-B41_1.12.2.jar new file mode 100644 index 0000000..577f02d Binary files /dev/null and b/mods/Hwyla-1.8.26-B41_1.12.2.jar differ