diff options
author | ohowe <42757516+carelesshippo@users.noreply.github.com> | 2021-06-02 11:55:36 -0600 |
---|---|---|
committer | ohowe <42757516+carelesshippo@users.noreply.github.com> | 2021-06-02 11:55:36 -0600 |
commit | eeb5c45d71997cb259fc35330490a19db7865603 (patch) | |
tree | 65771b27ed837896fa3140dec1af78306accebcd /src/main/resources | |
parent | 4d9e538ced80728bca74491698347333f515bfcc (diff) | |
parent | 1b172089ce502803f7644611afd618ce00dcb860 (diff) | |
download | NotEnoughUpdates-eeb5c45d71997cb259fc35330490a19db7865603.tar.gz NotEnoughUpdates-eeb5c45d71997cb259fc35330490a19db7865603.tar.bz2 NotEnoughUpdates-eeb5c45d71997cb259fc35330490a19db7865603.zip |
Merge branch 'Moulberry:master' into master
Diffstat (limited to 'src/main/resources')
13 files changed, 7 insertions, 2 deletions
diff --git a/src/main/resources/assets/notenoughupdates/fishing_warning_exclam.png b/src/main/resources/assets/notenoughupdates/fishing_warning_exclam.png Binary files differnew file mode 100644 index 00000000..914e86bf --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/fishing_warning_exclam.png diff --git a/src/main/resources/assets/notenoughupdates/groundplane.png b/src/main/resources/assets/notenoughupdates/groundplane.png Binary files differnew file mode 100644 index 00000000..99630d67 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/groundplane.png diff --git a/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-1.png b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-1.png Binary files differnew file mode 100644 index 00000000..e6d34776 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-1.png diff --git a/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-2.png b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-2.png Binary files differnew file mode 100644 index 00000000..c94d88c1 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-2.png diff --git a/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-3.png b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-3.png Binary files differnew file mode 100644 index 00000000..8ca52a12 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-3.png diff --git a/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-4.png b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-4.png Binary files differnew file mode 100644 index 00000000..d889fef5 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-4.png diff --git a/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-5.png b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-5.png Binary files differnew file mode 100644 index 00000000..2e40a05b --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-5.png diff --git a/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-6.png b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-6.png Binary files differnew file mode 100644 index 00000000..95e684f7 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/portal_panoramas/nether/pansc-6.png diff --git a/src/main/resources/assets/notenoughupdates/slotlocking/bound.png b/src/main/resources/assets/notenoughupdates/slotlocking/bound.png Binary files differnew file mode 100644 index 00000000..1631d386 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/slotlocking/bound.png diff --git a/src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_3.png b/src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_3.png Binary files differindex e33a395c..5fceb152 100644 --- a/src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_3.png +++ b/src/main/resources/assets/notenoughupdates/storage_gui/storage_gui_3.png diff --git a/src/main/resources/assets/notenoughupdates/storage_gui/storage_preview_3.png b/src/main/resources/assets/notenoughupdates/storage_gui/storage_preview_3.png Binary files differindex d94bb97d..7ead5a79 100644 --- a/src/main/resources/assets/notenoughupdates/storage_gui/storage_preview_3.png +++ b/src/main/resources/assets/notenoughupdates/storage_gui/storage_preview_3.png diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json index fe9d56ad..4c0261bb 100644 --- a/src/main/resources/mixins.notenoughupdates.json +++ b/src/main/resources/mixins.notenoughupdates.json @@ -34,6 +34,8 @@ "MixinAbstractClientPlayer", "MixinInventoryPlayer", "MixinItemRenderer", - "MixinEntityPlayerSP" + "MixinEntityPlayerSP", + "MixinLoadingScreenRenderer", + "MixinWorldClient" ] }
\ No newline at end of file diff --git a/src/main/resources/notenoughupdates_at.cfg b/src/main/resources/notenoughupdates_at.cfg index 5e567296..c3fb5dbc 100644 --- a/src/main/resources/notenoughupdates_at.cfg +++ b/src/main/resources/notenoughupdates_at.cfg @@ -5,4 +5,7 @@ public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop public net.minecraft.client.gui.inventory.GuiContainer func_146975_c(II)Lnet/minecraft/inventory/Slot; #guiTop public net.minecraft.client.gui.inventory.GuiEditSign field_146848_f #tileSign public net.minecraft.client.gui.inventory.GuiContainer func_146977_a(Lnet/minecraft/inventory/Slot;)V #drawSlot -public net.minecraft.client.gui.inventory.GuiContainer func_146981_a(Lnet/minecraft/inventory/Slot;II)Z #isMouseOverSlot
\ No newline at end of file +public net.minecraft.client.gui.inventory.GuiContainer func_146981_a(Lnet/minecraft/inventory/Slot;II)Z #isMouseOverSlot +public net.minecraft.client.renderer.RenderGlobal field_72755_R #renderInfos +public net.minecraft.client.renderer.RenderGlobal$ContainerLocalRenderInformation +public net.minecraft.client.renderer.RenderGlobal$ContainerLocalRenderInformation field_178036_a #renderChunk
\ No newline at end of file |