Merge branch 'Alpha' into 1.19.3

vindocel · Dec 17, 2022 · 9d73c55 · 9d73c55
2 parents 23bafc7 + c7a8edd
commit 9d73c55
Show file tree

Hide file tree

Showing 102 changed files with 7 additions and 1 deletion.
diff --git a/assets/lazierae2/textures/gui/buttons/auto_extract.png b/assets/lazierae2/textures/gui/buttons/auto_extract.png
diff --git a/assets/lazierae2/textures/gui/buttons/dump.png b/assets/lazierae2/textures/gui/buttons/dump.png
diff --git a/assets/lazierae2/textures/gui/buttons/io.png b/assets/lazierae2/textures/gui/buttons/io.png
diff --git a/assets/lazierae2/textures/gui/buttons/state.png b/assets/lazierae2/textures/gui/buttons/state.png
diff --git a/assets/lazierae2/textures/gui/buttons/submit.png b/assets/lazierae2/textures/gui/buttons/submit.png
diff --git a/assets/lazierae2/textures/gui/processor.png b/assets/lazierae2/textures/gui/processor.png
diff --git a/assets/lazierae2/textures/gui/progress/aggregator.png b/assets/lazierae2/textures/gui/progress/aggregator.png
diff --git a/assets/lazierae2/textures/gui/progress/etcher.png b/assets/lazierae2/textures/gui/progress/etcher.png
diff --git a/assets/lazierae2/textures/gui/progress/grinder.png b/assets/lazierae2/textures/gui/progress/grinder.png
diff --git a/assets/lazierae2/textures/gui/progress/infuser.png b/assets/lazierae2/textures/gui/progress/infuser.png
diff --git a/assets/lazierae2/textures/gui/requester.png b/assets/lazierae2/textures/gui/requester.png
diff --git a/assets/minecraft/shaders/core/rendertype_text.fsh b/assets/minecraft/shaders/core/rendertype_text.fsh
@@ -30,3 +30,5 @@ void main() {
 
     fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
 }
+
+//Credits: Default-Dark-Mode: https://github.com/nebuIr/Default-Dark-Mode | nebuIr: https://github.com/nebuIr
diff --git a/assets/minecraft/shaders/core/rendertype_text_intensity.fsh b/assets/minecraft/shaders/core/rendertype_text_intensity.fsh
@@ -30,3 +30,5 @@ void main() {
 
     fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
 }
+
+//Credits: Default-Dark-Mode: https://github.com/nebuIr/Default-Dark-Mode | nebuIr: https://github.com/nebuIr
diff --git a/assets/minecraft/texts/splashes.txt b/assets/minecraft/texts/splashes.txt
@@ -1 +1 @@
-v1.3.4
+v1.3.5
diff --git a/assets/pneumaticcraft/textures/gui/gui_advanced_air_compressor.png b/assets/pneumaticcraft/textures/gui/gui_advanced_air_compressor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_advanced_liquid_compressor.png b/assets/pneumaticcraft/textures/gui/gui_advanced_liquid_compressor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_air_cannon.png b/assets/pneumaticcraft/textures/gui/gui_air_cannon.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_air_compressor.png b/assets/pneumaticcraft/textures/gui/gui_air_compressor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_amadron.png b/assets/pneumaticcraft/textures/gui/gui_amadron.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_amadron_add_trade.png b/assets/pneumaticcraft/textures/gui/gui_amadron_add_trade.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_assembly_controller.png b/assets/pneumaticcraft/textures/gui/gui_assembly_controller.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_buildcraft_energy.png b/assets/pneumaticcraft/textures/gui/gui_buildcraft_energy.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_charging_station.png b/assets/pneumaticcraft/textures/gui/gui_charging_station.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_charging_upgrade_manager.png b/assets/pneumaticcraft/textures/gui/gui_charging_upgrade_manager.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_elevator.png b/assets/pneumaticcraft/textures/gui/gui_elevator.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_etching_tank.png b/assets/pneumaticcraft/textures/gui/gui_etching_tank.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_fluid_mixer.png b/assets/pneumaticcraft/textures/gui/gui_fluid_mixer.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_fluid_tank.png b/assets/pneumaticcraft/textures/gui/gui_fluid_tank.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_gas_lift.png b/assets/pneumaticcraft/textures/gui/gui_gas_lift.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_hacking.png b/assets/pneumaticcraft/textures/gui/gui_hacking.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_inventory_searcher.png b/assets/pneumaticcraft/textures/gui/gui_inventory_searcher.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_item_searcher.png b/assets/pneumaticcraft/textures/gui/gui_item_searcher.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_jackhammer_setup.png b/assets/pneumaticcraft/textures/gui/gui_jackhammer_setup.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_kerosene_lamp.png b/assets/pneumaticcraft/textures/gui/gui_kerosene_lamp.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_liquid_compressor.png b/assets/pneumaticcraft/textures/gui/gui_liquid_compressor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_liquid_hopper.png b/assets/pneumaticcraft/textures/gui/gui_liquid_hopper.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_logistics_requester.png b/assets/pneumaticcraft/textures/gui/gui_logistics_requester.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_micromissile.png b/assets/pneumaticcraft/textures/gui/gui_micromissile.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_minigun_magazine.png b/assets/pneumaticcraft/textures/gui/gui_minigun_magazine.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_omnidirectional_hopper.png b/assets/pneumaticcraft/textures/gui/gui_omnidirectional_hopper.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_pastebin.png b/assets/pneumaticcraft/textures/gui/gui_pastebin.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_pneumatic_door_base.png b/assets/pneumaticcraft/textures/gui/gui_pneumatic_door_base.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_pressure_chamber.png b/assets/pneumaticcraft/textures/gui/gui_pressure_chamber.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_pressure_chamber_interface.png b/assets/pneumaticcraft/textures/gui/gui_pressure_chamber_interface.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_pressurized_spawner.png b/assets/pneumaticcraft/textures/gui/gui_pressurized_spawner.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_programmable_controller.png b/assets/pneumaticcraft/textures/gui/gui_programmable_controller.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_programmer.png b/assets/pneumaticcraft/textures/gui/gui_programmer.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_programmer_large.png b/assets/pneumaticcraft/textures/gui/gui_programmer_large.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_refinery.png b/assets/pneumaticcraft/textures/gui/gui_refinery.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_reinforced_chest.png b/assets/pneumaticcraft/textures/gui/gui_reinforced_chest.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_remote_editor.png b/assets/pneumaticcraft/textures/gui/gui_remote_editor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_security_station.png b/assets/pneumaticcraft/textures/gui/gui_security_station.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_sentry_turret.png b/assets/pneumaticcraft/textures/gui/gui_sentry_turret.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_smart_chest.png b/assets/pneumaticcraft/textures/gui/gui_smart_chest.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_tag_workbench.png b/assets/pneumaticcraft/textures/gui/gui_tag_workbench.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_text_widget.png b/assets/pneumaticcraft/textures/gui/gui_text_widget.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_thermal_compressor.png b/assets/pneumaticcraft/textures/gui/gui_thermal_compressor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_thermopneumatic_processing_plant.png b/assets/pneumaticcraft/textures/gui/gui_thermopneumatic_processing_plant.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_tube_module.png b/assets/pneumaticcraft/textures/gui/gui_tube_module.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_tube_module_simple.png b/assets/pneumaticcraft/textures/gui/gui_tube_module_simple.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_universal_sensor.png b/assets/pneumaticcraft/textures/gui/gui_universal_sensor.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_uv_light_box.png b/assets/pneumaticcraft/textures/gui/gui_uv_light_box.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_uv_light_box_on.png b/assets/pneumaticcraft/textures/gui/gui_uv_light_box_on.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_vacuum_pump.png b/assets/pneumaticcraft/textures/gui/gui_vacuum_pump.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_vacuum_trap.png b/assets/pneumaticcraft/textures/gui/gui_vacuum_trap.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_widget_area.png b/assets/pneumaticcraft/textures/gui/gui_widget_area.png
diff --git a/assets/pneumaticcraft/textures/gui/gui_widget_options.png b/assets/pneumaticcraft/textures/gui/gui_widget_options.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_1x1.png b/assets/pneumaticcraft/textures/gui/icon/gui_1x1.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_1x2.png b/assets/pneumaticcraft/textures/gui/icon/gui_1x2.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_1x3.png b/assets/pneumaticcraft/textures/gui/icon/gui_1x3.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_3x3_cross.png b/assets/pneumaticcraft/textures/gui/icon/gui_3x3_cross.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_3x3_full.png b/assets/pneumaticcraft/textures/gui/icon/gui_3x3_full.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_charge_idle.png b/assets/pneumaticcraft/textures/gui/icon/gui_charge_idle.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_charging.png b/assets/pneumaticcraft/textures/gui/icon/gui_charging.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_copy.png b/assets/pneumaticcraft/textures/gui/icon/gui_copy.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_delete.png b/assets/pneumaticcraft/textures/gui/icon/gui_delete.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_discharging.png b/assets/pneumaticcraft/textures/gui/icon/gui_discharging.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_filter.png b/assets/pneumaticcraft/textures/gui/icon/gui_filter.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_high_signal_angle.png b/assets/pneumaticcraft/textures/gui/icon/gui_high_signal_angle.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_high_signal_space.png b/assets/pneumaticcraft/textures/gui/icon/gui_high_signal_space.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_paste.png b/assets/pneumaticcraft/textures/gui/icon/gui_paste.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_pastebin_icon.png b/assets/pneumaticcraft/textures/gui/icon/gui_pastebin_icon.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_redo.png b/assets/pneumaticcraft/textures/gui/icon/gui_redo.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_undo.png b/assets/pneumaticcraft/textures/gui/icon/gui_undo.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_vein.png b/assets/pneumaticcraft/textures/gui/icon/gui_vein.png
diff --git a/assets/pneumaticcraft/textures/gui/icon/gui_vein_plus.png b/assets/pneumaticcraft/textures/gui/icon/gui_vein_plus.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_assembly_controller.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_assembly_controller.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_etching_tank.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_etching_tank.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_fluid_mixer.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_fluid_mixer.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_heat_properties.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_heat_properties.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_memory_essence.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_memory_essence.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_misc_recipes.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_misc_recipes.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_pressure_chamber.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_pressure_chamber.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_spawner_extraction.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_spawner_extraction.png
diff --git a/...ts/pneumaticcraft/textures/gui/jei/gui_jei_thermopneumatic_processing_plant.png b/...ts/pneumaticcraft/textures/gui/jei/gui_jei_thermopneumatic_processing_plant.png
diff --git a/assets/pneumaticcraft/textures/gui/jei/gui_jei_yeast_crafting.png b/assets/pneumaticcraft/textures/gui/jei/gui_jei_yeast_crafting.png
diff --git a/assets/pneumaticcraft/textures/gui/widget/widget_amadron_offer.png b/assets/pneumaticcraft/textures/gui/widget/widget_amadron_offer.png
diff --git a/assets/pneumaticcraft/textures/gui/widget/widget_energy.png b/assets/pneumaticcraft/textures/gui/widget/widget_energy.png
diff --git a/assets/pneumaticcraft/textures/gui/widget/widget_tank.png b/assets/pneumaticcraft/textures/gui/widget/widget_tank.png
diff --git a/assets/pneumaticcraft/textures/gui/widget/widget_temperature.png b/assets/pneumaticcraft/textures/gui/widget/widget_temperature.png
diff --git a/assets/pneumaticcraft/textures/gui/widget/widget_vertical_scrollbar.png b/assets/pneumaticcraft/textures/gui/widget/widget_vertical_scrollbar.png
diff --git a/mod support.txt b/mod support.txt
@@ -36,13 +36,15 @@ Industrial Foregoing
 jei
 Just Enough Resources (JER)
 LaserIO
+Lazierae2
 mekanism
 ME Requester
 Mystical Agriculture
 MrCrayfish's Furniture Mod
 Mob Grinding Utils
 Nature's Aura
 Pipez
+Pneumaticcraft
 Powah! (Rearchitected)
 Polymorph
 Productive Bees
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,5 @@ void main() {

		fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
		}

		//Credits: Default-Dark-Mode: https://github.com/nebuIr/Default-Dark-Mode \| nebuIr: https://github.com/nebuIr