Skip to content

Commit

Permalink
Merge pull request #294 from skiprocks999/1.21
Browse files Browse the repository at this point in the history
internal tweaks
  • Loading branch information
skiprocks999 authored Jan 23, 2025
2 parents d5fdacc + 1ec379b commit f2d6174
Show file tree
Hide file tree
Showing 109 changed files with 2,187 additions and 1,500 deletions.
2 changes: 1 addition & 1 deletion runs/client/usercache.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-14 16:53:57 -0600"}]
[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2025-02-19 16:54:57 -0600"}]
486 changes: 243 additions & 243 deletions src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
{
"values": [
"electrodynamics:electricfurnacedouble",
"electrodynamics:quarry",
"electrodynamics:creativepowersource",
"electrodynamics:electricarcfurnacedouble",
"electrodynamics:circuitmonitor",
"electrodynamics:electricarcfurnacetriple",
"electrodynamics:gastanksteel",
"electrodynamics:gascollector",
"electrodynamics:circuitbreaker",
"electrodynamics:oxidationfurnace",
"electrodynamics:advancedsolarpanel",
"electrodynamics:mineralgrinderdouble",
"electrodynamics:electricarcfurnace",
"electrodynamics:fermentationplant",
"electrodynamics:energizedalloyer",
"electrodynamics:combustionchamber",
"electrodynamics:multimeterblock",
"electrodynamics:electrolyticseparator",
"electrodynamics:creativefluidsource",
"electrodynamics:coalgenerator",
"electrodynamics:chemicalcrystallizer",
"electrodynamics:wiremill",
"electrodynamics:gastankreinforced",
"electrodynamics:circuitbreaker",
"electrodynamics:electricfurnace",
"electrodynamics:windmill",
"electrodynamics:mineralwasher",
"electrodynamics:tankhsla",
"electrodynamics:gaspipepump",
"electrodynamics:mineralcrusherdouble",
"electrodynamics:gasvalve",
"electrodynamics:lithiumbatterybox",
"electrodynamics:combustionchamber",
"electrodynamics:gaspipefilter",
"electrodynamics:currentregulator",
"electrodynamics:mineralwasher",
"electrodynamics:chemicalmixer",
"electrodynamics:windmill",
"electrodynamics:fluidpipepump",
"electrodynamics:relay",
"electrodynamics:chargerhv",
"electrodynamics:quarry",
"electrodynamics:advanceddowngradetransformer",
"electrodynamics:electricpump",
"electrodynamics:chargerlv",
"electrodynamics:gastanksteel",
"electrodynamics:lathe",
"electrodynamics:fluidpipefilter",
"electrodynamics:wiremilldouble",
"electrodynamics:downgradetransformer",
"electrodynamics:mineralgrindertriple",
"electrodynamics:potentiometer",
"electrodynamics:circuitmonitor",
"electrodynamics:mineralgrinder",
"electrodynamics:thermoelectricgenerator",
"electrodynamics:downgradetransformer",
"electrodynamics:electricfurnacetriple",
"electrodynamics:mineralcrusherdouble",
"electrodynamics:upgradetransformer",
"electrodynamics:electrolosischamber",
"electrodynamics:hydroelectricgenerator",
"electrodynamics:advancedupgradetransformer",
"electrodynamics:coolantresavoir",
"electrodynamics:electricfurnace",
"electrodynamics:wiremilldouble",
"electrodynamics:lathe",
"electrodynamics:chargerlv",
"electrodynamics:tanksteel",
"electrodynamics:gasvent",
"electrodynamics:fluidpipefilter",
"electrodynamics:reinforcedalloyer",
"electrodynamics:seismicrelay",
"electrodynamics:mineralcrushertriple",
"electrodynamics:fluidvoid",
"electrodynamics:chargermv",
"electrodynamics:coolantresavoir",
"electrodynamics:fluidvalve",
"electrodynamics:mineralgrindertriple",
"electrodynamics:gastankhsla",
"electrodynamics:electricarcfurnacedouble",
"electrodynamics:gaspipepump",
"electrodynamics:wiremilltriple",
"electrodynamics:batterybox",
"electrodynamics:electrolosischamber",
"electrodynamics:electricfurnacetriple",
"electrodynamics:fermentationplant",
"electrodynamics:energizedalloyer",
"electrodynamics:electricarcfurnacetriple",
"electrodynamics:seismicrelay",
"electrodynamics:tankhsla",
"electrodynamics:advanceddowngradetransformer",
"electrodynamics:gaspipefilter",
"electrodynamics:coalgenerator",
"electrodynamics:tankreinforced",
"electrodynamics:solarpanel",
"electrodynamics:advancedsolarpanel",
"electrodynamics:chargermv",
"electrodynamics:mineralcrusher",
"electrodynamics:reinforcedalloyer",
"electrodynamics:carbynebatterybox",
"electrodynamics:currentregulator",
"electrodynamics:upgradetransformer",
"electrodynamics:tanksteel",
"electrodynamics:wiremill",
"electrodynamics:creativegassource",
"electrodynamics:gascollector",
"electrodynamics:mineralgrinderdouble",
"electrodynamics:gasvalve",
"electrodynamics:oxidationfurnace",
"electrodynamics:fluidvalve",
"electrodynamics:fluidvoid",
"electrodynamics:gasvent",
"electrodynamics:gastankhsla",
"electrodynamics:electricarcfurnace",
"electrodynamics:relay",
"electrodynamics:chemicalcrystallizer",
"electrodynamics:multimeterblock",
"electrodynamics:mineralgrinder",
"electrodynamics:fluidpipepump",
"electrodynamics:electricfurnacedouble",
"electrodynamics:hydroelectricgenerator",
"electrodynamics:chemicalmixer",
"electrodynamics:solarpanel",
"electrodynamics:electricpump",
"electrodynamics:motorcomplex",
"electrodynamics:wiremilltriple",
"electrodynamics:electrolyticseparator",
"electrodynamics:potentiometer",
"electrodynamics:pipesteel",
"electrodynamics:pipecopper",
"electrodynamics:orefluorite",
Expand Down
Loading

0 comments on commit f2d6174

Please sign in to comment.