From 659f84575edbcbbc8e527949f4c3339defa86620 Mon Sep 17 00:00:00 2001 From: TehNut Date: Mon, 7 Sep 2015 15:06:08 -0700 Subject: [PATCH] Some final things before 0.2.0 --- ModVersions.txt | 192 ++++++++++++----------- config/eirairc/client.cfg | 70 ++++++--- config/eirairc/commands.json.example.txt | 21 +-- config/eirairc/formats/classic.cfg | 1 + config/eirairc/formats/s-light.cfg | 1 + config/eirairc/formats/twitch.cfg | 1 + config/eirairc/services.cfg | 4 + config/eirairc/shared.cfg | 40 +++-- config/eirairc/suggested-channels.json | 16 ++ 9 files changed, 195 insertions(+), 151 deletions(-) create mode 100644 config/eirairc/suggested-channels.json diff --git a/ModVersions.txt b/ModVersions.txt index c33a361..b9cdc52 100644 --- a/ModVersions.txt +++ b/ModVersions.txt @@ -2,156 +2,158 @@ Current Mod Versions NOTE: In no way is the modlist final. Do not ask about adding or removing mods until this list is internally stabilized. Also, some of these mods are here for pure experimentation for how they would fit in the pack. -Forge 1384 +Forge 1448 -Advanced Repulsion Systems v59.0.2 +Advanced Repulsion Systems v59.0.3 Advanced Solar Panels v3.5.1 -Another One Bites the Dust 2 v2.5.0 +Another One Bites the Dust 2 v2.8.2 Apple Core v1.1.0 -Applied Energistics 2 rv2-beta-28 +Applied Energistics 2 rv2-stable-10 Armor Status HUD v1.28 -AsieLib v0.3.13 -Automagy v0.22.2 +AsieLib v0.4.0 +Automagy v0.26.3 Baubles v1.0.1.10 -Bibliocraft v1.10.3 +Bibliocraft v1.10.6 Big Reactors v0.4.3A -Binnie's Mods 2.0-pre8 -Biomes O' Plenty v2.1.0.1237 -Blood Magic v1.3.2-1 -Botania v1.3-182 +Binnie's Mods 2.0-pre14 +Biomes O' Plenty v2.1.0.1390 +Blood Magic v1.3.3-13 +Botania v1.7-221 BspkrsCore v6.15 -Buildcraft v6.4.13 -Buildcraft Compat v6.4.2 -Carpenter's Blocks v3.3.6 -Chisel 2 v2.3.10.37 -Chisel Tones v1.0-1 -Code Chicken Core v1.0.5.37 -COFH Core v3.0.2-262 -Computronics v1.4.6 -Cookie Core v1.3.1-7 -CustomThings v0.0.2-27 +Buildcraft v7.0.22 +Buildcraft Compat v7.0.9 +Carpenter's Blocks v3.3.7-dev +Chisel v2.9.0.3 +Chisel Tones v1.0-3 +Code Chicken Core v1.0.7.47 +COFH Core v3.0.3-303 +Computronics v1.5.6 +Cookie Core v1.4.0-11 +CustomThings v0.0.3-38 Damage Indicators v3.2.3 Dense Ores v1.6.2 -Dimensional Anchors v59.0.2 -EiraIRC v2.8.TPPI -Electrical Age Beta v1.9-r46 -EnderIO v2.3.0.375 -Ender Storage v1.4.5.33 -ExtraCells v2.2.69b -ExtraTiC v1.4.1 -Extra Utilities v1.2.4b +Dimensional Anchors v59.0.3 +EiraIRC v2.9.376 +Electrical Age Beta v1.10-r50 +EnderCore v0.1.0.23-beta +EnderIO v2.3.0.413-beta +Ender Storage v1.4.7.36 +ExtraCells v2.2.73 +ExtraTiC v1.4.5 +Extra Utilities v1.2.11 FastCraft v1.21 (via mod download GUI) Forge MultiPart v1.1.0.331 FlatSigns v2.1.0.19 -FlaxBeards Steam Power v0.28.7 -Forbidden Magic v0.562 -Forestry v3.5.4.13 +FlaxBeards Steam Power v0.28.10 +Forbidden Magic v0.57 +Forestry v3.6.3.20 GraviSuite v2.0.3 -Guide-API v1.0-13 -Hardcore Ender Expansion v1.8 +Guide-API v1.0.1-20 +Hardcore Ender Expansion v1.8.3 Hats v4.0.1 -IC2 Nuclear Control v2.2.1a-Yolo +IC2 Nuclear Control v2.2.5a-GoingForTheKill iChunUtil v4.2.2 Illuminated Bows v1.7.1f -Immibis Core v59.0.8 -Immibis' Microblocks v59.0.5 -Industrial Craft 2exp v2.2.717 -Infernal Mobs v1.7.10 -InfiniBows v1.3.0.20 -INpureCore v1.0.0B9-54 +Immibis Core v59.1.2 +Immibis' Microblocks v59.1.1 +Industrial Craft 2exp v2.2.770 +Infernal Mobs v1.6.0 +INpureCore v1.0.0B9-62 Inventory Tweaks v1.59-dev-156 Iron Chests 2 v6.0.62.742 JABBA v1.2.1a -KitchenCraft-combo v0.0.1-57 +KitchenCraft-combo v1.0.0-62 Lib Sandstone v1.0.0 -Logistics Pipes v0.8.3.118 -Magic Bees v2.2.3 -Malisis Core v0.11.4 -Malisis Doors 1.6 -Mantle v0.3.2.187 -Mekanism v8.1.0.TPPIEdition -Mekanism Generators v8.1.1.225 +Logistics Pipes v0.9.2.46 +LookingGlass v0.2.0.00 +Magic Bees v2.2.5 +Malisis Core v0.12.9 +Malisis Doors 1.9.5 +Mantle v0.3.2.188 +Mekanism v8.1.7.TPPI +Mekanism Generators v8.1.7.252 MineFactory Reloaded v2.8.0-104 -MineTweaker 3 v3.0.9C +MineTweaker 3 v3.0.10 MmmMmmMmmMmm v1.6 Mobius Core v1.2.5 -ModpackTweaks v1.2.0-24 -ModularArmour v1.0.4-27 -ModTweaker2 v0.8.0 -MoreChisels v1.0-20 -Morph v0.9.1 -Mystcraft 0.11.5.00 -Natura v98.6a6cca1 -NEI Addons v1.12.6.18 -NEI Integration v1.0.9 -Nether Ores v2.3.0-12 +ModpackTweaks v1.2.0-26 +ModularArmour v1.0.18-41 +ModTweaker2 v0.9.3 +MoreChisels v1.0-25 +Morph v0.9.2 +Mystcraft 0.12.3.00 +Natura v99.04f2bb2 +NEI Addons v1.12.12.37 +NEI Integration v1.0.12 +Nether Ores v2.3.1-18 Not Enough Codecs v0.3-13 -Not Enough Items v1.0.4.95 -Open Blocks v1.4.1-snapshot-601 -Open Computers v1.5.9.591-dev +Not Enough Items v1.0.5.111 +Open Blocks v1.4.4-snapshot-665 +Open Computers v1.5.16.726-dev Open Eye v0.6-snapshot-145 -Open Mods Lib v0.7.1-snapshot-342 -Railcraft v9.5.0.0 +Open Mods Lib v0.8-snapshot-393 +Railcraft v9.7.0.0 Random Things v2.2.4 RecipeTweakingCore v1.1.0-8 -Red Logic v59.1.9 -Redstone Armory v1.1-28 -Redstone Arsenal v1.1.0-80 +Red Logic v59.1.11 +Redstone Armory v1.2.0-38 +Redstone Arsenal v1.1.1-89 Refined Relocation v1.0.8a Reliquary v1.2.257 -Sanguimancy v1.1.9-26 -ServerTools BACKUP v2.2.0.24 +Sanguimancy v1.1.9-32 +ServerTools BACKUP v2.2.1.24 ServerTools CORE v2.2.0.79 +StevesAddons v0.10.16 Steves Carts 2 v2.0.0b18 Steves Factory Manager vA93 -Storage Drawers v1.3.9 -Super Massive Tech v0.3.0-alpha-110 +Storage Drawers v1.6.0 +Super Massive Tech v0.1.0-alpha-112 Thaumcraft 4 v4.2.3.5 -ThaumcraftNEIPlugin v1.7 -Thaumic Energistics v0.8.9.3a-rv2 +ThaumcraftNEIPlugin v1.7a +Thaumic Energistics v0.8.10.10 Thaumic Exploration v1.1-37 -Thaumic Tinkerer v2.5-485 -Thermal Dynamics v1.0.0-122 -Thermal Expansion v4.0.1-182 -Thermal Foundation v1.0.0-81 -Tinkers Construct v1.8.4-940 +Thaumic Tinkerer v2.5-508 +Thermal Dynamics v1.1.0-161 +Thermal Expansion v4.0.3B1-218 +Thermal Foundation v1.2.0-102 +Tinkers Construct v1.8.7-979 Tinkers Mechworks v0.2.14.100 -Tinkers Steelworks v1.1.0-13 -Tinkers Tooltips v1.2.3 -TPPI-Tweaks v1.2.0-117 -Translocators v1.1.1.14 -ttCore v0.1.1-76 -Twilight Forest v2.3.5 +Tinkers Steelworks v1.1.1-17 +Tinkers Tooltips v1.2.4 +TPPI-Tweaks v1.2.0-118 +Translocators v1.1.2.15 +Twilight Forest v2.3.7 Waila v1.5.10 -Waila Plugins v0.0.1-14 -Wawla v1.2.1 +Waila Plugins v0.1.2-21 +Wawla v1.3.1 Wireless Redstone v1.4.1.9 Witchery v0.24.1 -Xaero's Minimap v1.4.1.3 +Xaero's Minimap v1.6.1.1 Ztones v2.2.1 **Server-Only Mods** -Admin Commands Toolbox v0.0.2a -Morpheus v1.5.19 -ServerTools PERMISSION v2.2.1.17 +chunkgen v1.2.3 +Morpheus v1.6.10 +ServerTools PERMISSION v2.2.1.7 ServerTools TELEPORTATION v2.2.0.13 **Mods Disabled By Default, but Included** -Opis v1.3.0dev12 +Opis v1.2.5 **Currently Disabled Mods (Due to crashes or other reasons)** -Ender Zoo v1.0.7.17 -Hardcore Questing Mod v4.2.1 +Admin Commands Toolbox +Ender Zoo +Hardcore Questing Mod Quarry Plus Thaumic Horizons **Mods Currently Waiting to be Updated** DartCraft -ElectroMagic Tools v2 +~~ElectroMagic Tools v2~~ Dead mod GregTech 6 Plugins For Forestry Resourceful Crops diff --git a/config/eirairc/client.cfg b/config/eirairc/client.cfg index 50e8d87..b6eae6a 100644 --- a/config/eirairc/client.cfg +++ b/config/eirairc/client.cfg @@ -1,5 +1,23 @@ # Configuration file +########################################################################################################## +# addons +#--------------------------------------------------------------------------------------------------------# +# Settings for EiraIRC addons that are not part of the core of the mod. +########################################################################################################## + +addons { + # eirairc:config.property.enableFancyOverlay.tooltip + B:eirairc_enableFancyOverlay=false + + # eirairc:config.property.fancyOverlayLifetime.tooltip + I:eirairc_fancyOverlayLifetime=240 + + # eirairc:config.property.fancyOverlayScale.tooltip + S:eirairc_fancyOverlayScale=0.5 +} + + ########################################################################################################## # compatibility #--------------------------------------------------------------------------------------------------------# @@ -7,16 +25,19 @@ ########################################################################################################## compatibility { - # No Chat Override + # [Advanced] Makes EiraIRC not apply any changes to the Minecraft Chat GUI at all. Only use with EiraIRC compatible chat-overriding mods! B:chatNoOverride=false - # Enable Client Bridge + # [Experimental] If set to true, EiraIRC will act like on a server and send chat messages to both Minecraft and IRC. May cause duplicate messages on servers with custom IRC nicks set up. B:clientBridge=false S:clientBridgeMessageToken=[IG] S:clientBridgeNickToken= - # Disable Chat Toggle + # Disables the chat toggle at the top left. Originally meant for TabbyChat, so you could set up Tabs with the '/irc msg' command instead. B:disableChatToggle=false + + # If set to true, EiraIRC will link commands such as /join, /msg or /nick to it's /irc variants for quicker usage. + B:registerShortCommands=true } @@ -27,17 +48,21 @@ compatibility { ########################################################################################################## general { - # Auto Reset Chat + # Automatically switch back to Minecraft chat when the chat window is closed. B:autoResetChat=false - # Persistent Connection + # If set to true, the IRC connection will remain open after leaving a world or server (until Minecraft closes). B:persistentConnection=true - - # If set to true, EiraIRC will link commands such as /join, /msg or /nick to it's /irc variants for quicker usage. B:registerShortCommands=false - # Show Welcome Screen + # eirairc:config.property.showModpackConfirmation.tooltip + B:showModpackConfirmation=true + + # If set to true, EiraIRC will show the welcome screen with suggested channels when joining a world. B:showWelcomeScreen=false + + # Puts the target channel name right into the chat box. + B:terminalStyleInput=false } @@ -48,22 +73,25 @@ general { ########################################################################################################## notifications { - # Friend Joined + # 0: none, 1: text, 2: sound, 3: text and sound S:friendJoined=TextOnly - # Name Mentioned + # 0: none, 1: text, 2: sound, 3: text and sound S:nameMentioned=TextAndSound - # Private Message - S:privateMessage=TextOnly + # eirairc:config.property.notificationSound.tooltip + S:notificationSound=note.harp - # Notification Sound - S:soundName=note.harp + # eirairc:config.property.notificationSoundPitch.tooltip + S:notificationSoundPitch=1.0 - # Notification Pitch - S:soundPitch=1.0 + # eirairc:config.property.notificationSoundVolume.tooltip + S:notificationSoundVolume=1.0 - # Notification Volume + # 0: none, 1: text, 2: sound, 3: text and sound + S:privateMessage=TextOnly + S:soundName=note.harp + S:soundPitch=1.0 S:soundVolume=1.0 } @@ -75,16 +103,16 @@ notifications { ########################################################################################################## screenshots { - # Auto-Perform-Action - S:autoAction=UploadShare + # [Deprecated] The action to perform after a screenshot was taken. + S:autoAction=None # If set to true, clicking an image link in the chat will open a preview screen inside Minecraft. B:imageLinkPreview=true - # Buffer Size + # [Advanced] Why would you even touch this option? I:uploadBufferSize=1024 - # Upload Hoster + # The name of the hoster to upload screenshots to. Valid values are: imgur, DirectUpload S:uploadHoster= } diff --git a/config/eirairc/commands.json.example.txt b/config/eirairc/commands.json.example.txt index bdea0b1..b510b30 100644 --- a/config/eirairc/commands.json.example.txt +++ b/config/eirairc/commands.json.example.txt @@ -6,7 +6,8 @@ "runAsOp": true, "requireAuth": false, "allowArgs": false, - "description": "Broadcasts the current TPS to the channel." + "outputFilter": "Dimension 0:.+", + "description": "Broadcasts the current TPS to the channel, filtering the output for the overworld only." }, { "name": "players", @@ -28,15 +29,6 @@ "allowArgs": true, "description": "Bans the specified player with an optional reason from the server. /ban \u003cname\u003e [reason ...]. Authed only." }, - { - "name": "ban-ip", - "command": "ban-ip", - "broadcastResult": false, - "runAsOp": true, - "requireAuth": true, - "allowArgs": true, - "description": "Bans the specified IP address with an optional reason from the server. /ban \u003caddress|name\u003e [reason ...]. Authed only." - }, { "name": "banlist", "command": "banlist", @@ -54,14 +46,5 @@ "requireAuth": true, "allowArgs": true, "description": "Unbans (pardons) the specified player on the server. /pardon \u003cname\u003e. Authed only." - }, - { - "name": "pardon-ip", - "command": "pardon-ip", - "broadcastResult": false, - "runAsOp": true, - "requireAuth": true, - "allowArgs": true, - "description": "Unbans (pardons) the specified IP address on the server. /pardon-ip \u003caddress\u003e. Authed only." } ] \ No newline at end of file diff --git a/config/eirairc/formats/classic.cfg b/config/eirairc/formats/classic.cfg index e44cb6b..208970c 100755 --- a/config/eirairc/formats/classic.cfg +++ b/config/eirairc/formats/classic.cfg @@ -13,6 +13,7 @@ format { S:mcSendChannelMessage="[{CHANNEL}] <{NICK}> {MESSAGE}" S:mcSendPrivateEmote="[->{CHANNEL}] * {NICK} {MESSAGE}" S:mcSendPrivateMessage="[->{CHANNEL}] <{NICK}> {MESSAGE}" + S:mcTopic="§e[{CHANNEL}] §f{MESSAGE}" S:mcUserJoin="§e[{CHANNEL}] {NICK} joined the channel" S:mcUserLeave="§e[{CHANNEL}] {NICK} left the channel" S:mcUserNickChange="§e[{CHANNEL}] {OLDNICK} is now known as {NICK}" diff --git a/config/eirairc/formats/s-light.cfg b/config/eirairc/formats/s-light.cfg index 4c1ec07..46f5fb5 100755 --- a/config/eirairc/formats/s-light.cfg +++ b/config/eirairc/formats/s-light.cfg @@ -13,6 +13,7 @@ format { S:mcSendChannelMessage="[{NICK}] {MESSAGE}" S:mcSendPrivateEmote="[[>{CHANNEL}] {NICK} {MESSAGE} ]" S:mcSendPrivateMessage="[[>{CHANNEL}]{NICK}] {MESSAGE}" + S:mcTopic="§e[{CHANNEL}] §f{MESSAGE}" S:mcUserJoin="§e[{CHANNEL}] {NICK} joined the channel" S:mcUserLeave="§e[{CHANNEL}] {NICK} left the channel" S:mcUserNickChange="§e[{CHANNEL}] {OLDNICK} is now known as {NICK}" diff --git a/config/eirairc/formats/twitch.cfg b/config/eirairc/formats/twitch.cfg index 188555f..9c4883f 100755 --- a/config/eirairc/formats/twitch.cfg +++ b/config/eirairc/formats/twitch.cfg @@ -13,6 +13,7 @@ format { S:mcSendChannelMessage="[Twitch] <{NICK}> {MESSAGE}" S:mcSendPrivateEmote="[->{CHANNEL}] * {NICK} {MESSAGE}" S:mcSendPrivateMessage="[->{CHANNEL}] <{NICK}> {MESSAGE}" + S:mcTopic="§e[{CHANNEL}] §f{MESSAGE}" S:mcUserJoin="§e[{CHANNEL}] {NICK} joined the channel" S:mcUserLeave="§e[{CHANNEL}] {NICK} left the channel" S:mcUserNickChange="§e[{CHANNEL}] {OLDNICK} is now known as {NICK}" diff --git a/config/eirairc/services.cfg b/config/eirairc/services.cfg index f06916f..b21625c 100755 --- a/config/eirairc/services.cfg +++ b/config/eirairc/services.cfg @@ -8,6 +8,7 @@ services { S:serverList < "irc.synirc.net" > + S:serviceName=NickServ } atheme { @@ -16,11 +17,13 @@ services { S:serverList < "irc.esper.net" > + S:serviceName=NickServ } anope { S:cmdGhost=PRIVMSG NickServ :GHOST {NICK} {PASS} S:cmdIdentify=PRIVMSG NickServ :IDENTIFY {PASS} + S:serviceName=NickServ } qbot { @@ -28,6 +31,7 @@ services { S:serverList < "irc.quakenet.org" > + S:serviceName=Q } } diff --git a/config/eirairc/shared.cfg b/config/eirairc/shared.cfg index c2f7259..99e3739 100644 --- a/config/eirairc/shared.cfg +++ b/config/eirairc/shared.cfg @@ -1,5 +1,15 @@ # Configuration file +########################################################################################################## +# addons +#--------------------------------------------------------------------------------------------------------# +# Settings for EiraIRC addons that are not part of the core of the mod. +########################################################################################################## + +addons { +} + + ########################################################################################################## # bot #--------------------------------------------------------------------------------------------------------# @@ -7,7 +17,7 @@ ########################################################################################################## bot { - # If set to true, CTCP queries can be sent and received from this IRC context. + # If set to true, CTCP queries from this IRC context will be allowed. B:allowCTCP=false # If set to true, private messages can be sent and received from this IRC context. @@ -82,7 +92,7 @@ bot { ########################################################################################################## general { - # A list of colors that players are not allowed to use as name colors when using the '/irc color' command. + # A list of colors that players are not allowed to use as name colors when using the '/irc color' command. [default: [black], [darkgray]] S:colorBlacklist < black darkgray @@ -91,10 +101,8 @@ general { # [Advanced] If set to true, raw IRC messages will be printed into the log for investigation purposes. B:debugMode=false - # Default Chat + # The default chat target to select when opening the chat for the first time. S:defaultChat=Minecraft - - # [Deprecated] If set to true, OPs can assign an alias for a MC nick that will be used instead. B:enablePlayerAliases=false # If set to true, players can use the '/irc color' command to set a color for their MC nick. See also: colorBlacklist @@ -103,13 +111,11 @@ general { # If set to true, EiraIRC will attempt to strip player name tags such as [Admin] (that were added by other mods) when sending to IRC. B:hidePlayerTags=true - # eirairc:config.property.ircCommandPrefix.tooltip + # The prefix to be used for running commands in an IRC channel. S:ircCommandPrefix=! # This adds an invisible character to player names sent to IRC to prevent pinging those users of the same name on IRC. Thanks to Simon Meskens! B:preventUserPing=false - - # If enabled, Twitch users will have their subscriber, mod and caster badges in chat. Requires EiraMoticons. B:twitchNameBadges=true # If enabled, EiraIRC will attempt to map Twitch colors to Minecraft colors for nicks. @@ -138,6 +144,8 @@ network { # [Advanced] The username to authenticate with the proxy, if necessary. S:proxyUsername= + + # [Advanced] The path to a custom SSL truststore. S:sslCustomTrustStore= # [Advanced] If set to true, disables DiffieHellman encryption for SSL connections to work around a Java issue. @@ -180,28 +188,28 @@ settings { theme { # Color for emote messages. - S:emoteTextColor=5 + S:emoteTextColor=gold # Color for default IRC names. - S:ircNameColor=5 + S:ircNameColor=gray # Color for IRC NOTICE messages. - S:ircNoticeTextColor=5 + S:ircNoticeTextColor=red # Color for operator IRC names. - S:ircOpNameColor=5 + S:ircOpNameColor=gold # Color for IRC names in private chat. - S:ircPrivateNameColor=5 + S:ircPrivateNameColor=gray # Color for voiced IRC names. - S:ircVoiceNameColor=5 + S:ircVoiceNameColor=gray # Color for default Minecraft names. - S:mcNameColor=5 + S:mcNameColor=white # Color for operator Minecraft names. - S:mcOpNameColor=5 + S:mcOpNameColor=red } diff --git a/config/eirairc/suggested-channels.json b/config/eirairc/suggested-channels.json new file mode 100644 index 0000000..d10affc --- /dev/null +++ b/config/eirairc/suggested-channels.json @@ -0,0 +1,16 @@ +[ + { + "server": "irc.esper.net", + "channel": "#PlayTPPI", + "description": "This is the channel that all players connect to if they enable EiraIRC. Meant for general chat while playing.", + "modpack-display": "Test Pack Please Ignore (2)", + "recommended": true + }, + { + "server": "irc.esper.net", + "channel": "#PlayTPPI", + "description": "This is the TestPackPleaseIgnore(2) support channel. Come here for support related issues.", + "modpack-display": "Test Pack Please Ignore (2)", + "recommended": true + } +] \ No newline at end of file