Skip to content
This repository has been archived by the owner on Jul 2, 2023. It is now read-only.

Commit

Permalink
Merge branch 'stable' into Public-Release
Browse files Browse the repository at this point in the history
  • Loading branch information
Zephira58 committed Jun 14, 2022
2 parents ef42415 + 870e1f3 commit a8d3a4b
Show file tree
Hide file tree
Showing 548 changed files with 1,018 additions and 183 deletions.
104 changes: 0 additions & 104 deletions .github/README.md

This file was deleted.

Binary file added .xvr/Bins/Vanilla Renewed 2.2.exe
Binary file not shown.
1 change: 1 addition & 0 deletions .xvr/Scripts/install location.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{userappdata}\.minecraft\resourcepacks\{#MyAppName}
40 changes: 40 additions & 0 deletions .xvr/Scripts/xvr script 2.2.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Vanilla Renewed"
#define MyAppVersion "2.2"
#define MyAppPublisher "Xanthus58"
#define MyAppURL "https://github.com/Xanthus58/Vanilla-Renewed"

[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{CC562755-FD1D-43C3-BCC2-772634E50281}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={userappdata}\.minecraft\resourcepacks\{#MyAppName}
DisableDirPage=yes
DefaultGroupName={#MyAppName}
DisableProgramGroupPage=yes
LicenseFile=C:\Users\pikac\Documents\Minecraft\XVR LICENSE.txt
; Remove the following line to run in administrative install mode (install for all users.)
PrivilegesRequired=lowest
OutputDir=C:\Users\pikac\Documents\bins
OutputBaseFilename=Vanilla Renewed 2.2
SetupIconFile=C:\Users\pikac\Documents\Minecraft\XVR Logo.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern

[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"

[Files]
Source: "C:\Users\pikac\Documents\Minecraft\Vanilla Renewed\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

Binary file added .xvr/XVR Logo.ico
Binary file not shown.
77 changes: 0 additions & 77 deletions README.md

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/awkward/l"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/awkward/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/awkward/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/l"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/ll"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/ls"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/pl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/ps"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/sl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/fire_resistance/ss"}}
8 changes: 8 additions & 0 deletions Vanilla Renewed/assets/minecraft/models/item/harming/l.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "item/o",
"layer1": "item/harming/l",
"particles": "item/harming/l"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/ll"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/ls"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/pl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/ps"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/s","particles":"item/empty_splash"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/sl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/harming/ss"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/l"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/ll"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/ls"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/pl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/ps"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/sl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/healing/ss"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/l"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/ll"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/ls"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/pl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/ps"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/sl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/invisibility/ss"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/l"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/ll"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/ls"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/pl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/ps"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/sl"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/leaping/ss"}}
1 change: 1 addition & 0 deletions Vanilla Renewed/assets/minecraft/models/item/luck/l.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/luck/l"}}
1 change: 1 addition & 0 deletions Vanilla Renewed/assets/minecraft/models/item/luck/p.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/luck/p"}}
1 change: 1 addition & 0 deletions Vanilla Renewed/assets/minecraft/models/item/luck/s.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/luck/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/mundane/l"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/mundane/p"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/mundane/s"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"parent":"item/generated","textures":{"layer0":"item/o","layer1":"item/night_vision/l"}}
Loading

0 comments on commit a8d3a4b

Please sign in to comment.