Merge pull request #325 from TheDuckCow/dev

v3.4.0 dev to master

.gitignore

@@ -1,10 +1,11 @@
 .DS_Store
-*.png
 *.blend
 __pycache__
 MCprep_addon/mcprep_addon_tracker.json
 MCprep_addon/mcprep_addon_updater/MCprep_addon_updater_status.json
 blender_execs.txt
 blender_installs.txt
 build
-test_results.tsv
+test_results.tsv
+debug_save_state.blend1
+MCprep_addon/MCprep_resources/resourcepacks/mcprep_default/materials.blend1

CONTRIBUTING.md

@@ -85,11 +85,11 @@ In order to run these tests, **you must ensure your git folder with your MCprep
 
 At the moment, only the project lead (TheDuckCow) should ever mint new releases for MCprep. However, the steps are noted here for completeness:
 
-1. All releases need a correpsonding milestone, like v3.3.1
+1. All releases need a corresponding milestone, like v3.3.1
+1. Make sure the version is the correct number for the release (should match a corresponding milestone). Make this commit on the dev branch.
 1. Create a pull request and merge dev into master (without deleting the dev branch). Close out any remaining corresponding milestones. Add this pull request to the milestone, only merging when all other tasks are completed or moved out of the milestone.
 1. Check out master, git pull
-1. Make sure the version is the correct number for the release (should match a corresponding milestone)
-1. Make sure that `"dev" = False` in conf.py, so that prod resources are used for reporting
+1. Make sure that `"dev" = False` in conf.py, so that prod resources are used for reporting (it should always be this way on the master branch without doing anything, even after doing a merge from dev; but *always* double check)
 1. Create [a draft release](https://github.com/TheDuckCow/MCprep/releases/new) on GitHub
    - Tag is in the form `3.3.1`, no leading `v`.
    - The title however is in the form `MCprep v3.3.0 | ShortName` where version has a leading `v`.
@@ -105,6 +105,7 @@ At the moment, only the project lead (TheDuckCow) should ever mint new releases
    1. If it works, then **immediately update** the https://theduckcow.com/dev/blender/mcprep-download/ page to point to the new number (must be manually updated by TheDuckCow).
    1. Anything wrong? Immediately delete the entire release, and as a second step, also delete the tag (you likely want to copy the markdown text of the release though to a safe temporary space, so you don't lose that). You can do both steps from the github UI.
 1. After release, enter hypercare by monitoring the discord channel and the datastudio dashboard for error reporting (only core contributors will have access to this)
+1. git checkout dev, and then upversion the dev branch to a unique incremental version. So if you just released v3.3.1, then the dev branch should be updated to be (3, 3, 1, 1) so that we can tell official releases apart from dev versions.
 
 
 

MCprep_addon/MCprep_resources/effects/geonodes/weather_effects_geo_by_the3pooka.json

@@ -0,0 +1,106 @@
+{
+	"Camera Weather Nodes":{
+		"Snow": {
+			"Weather Type": 0,
+			"Camera Rotation": "CAMERA_OBJ",
+			"Weather Folower": "FOLLOW_OBJ",
+			"Density": 0.960,
+			"Main Directioanl XYZ": [0, 0, -34.31],
+			"Spread": 7.690,
+			"Time": 76.32,
+			"Directioanl Ratio": 6.37,
+			"Chaos Ratio": 6.57,
+			"Random Rotation Ratio": 2.3,
+			"Scale Ratio": 0.54,
+			"On\\Off Random Scale": 0.0,
+			"Size of Single Square": 23,
+			"Weather Grid Size x": 33,
+			"Weather Grid Size y": 33
+		},
+		"Ash": {
+			"Weather Type": 1,
+			"Camera Rotation": "CAMERA_OBJ",
+			"Weather Folower": "FOLLOW_OBJ",
+			"Density": 0.710,
+			"Main Directioanl XYZ": [-18.394, 0, -34.9],
+			"Spread": 15.160,
+			"Time": 134.1,
+			"Directioanl Ratio": 5.37,
+			"Chaos Ratio": 33.870,
+			"Random Rotation Ratio": 2.24,
+			"Scale Ratio": -0.61,
+			"On\\Off Random Scale": 1.0,
+			"Size of Single Square": 23,
+			"Weather Grid Size x": 33,
+			"Weather Grid Size y": 33
+		},
+		"Rain": {
+			"Weather Type": 2,
+			"Camera Rotation": "CAMERA_OBJ",
+			"Weather Folower": "FOLLOW_OBJ",
+			"Density": 0.710,
+			"Main Directioanl XYZ": [0, 0, -34.9],
+			"Spread": 3.350,
+			"Time": 12.450,
+			"Directioanl Ratio": 19.510,
+			"Chaos Ratio": 2.780,
+			"Random Rotation Ratio": 2.240,
+			"Scale Ratio": -0.610,
+			"On\\Off Random Scale": 0.0,
+			"Size of Single Square": 23,
+			"Weather Grid Size x": 33,
+			"Weather Grid Size y": 33
+		},
+		"Spores": {
+			"Weather Type": 3,
+			"Camera Rotation": "CAMERA_OBJ",
+			"Weather Folower": "FOLLOW_OBJ",
+			"Density": 0.710,
+			"Main Directioanl XYZ": [0, 0, -8.67],
+			"Spread": 18.340,
+			"Time": 145.69,
+			"Directioanl Ratio": 0.880,
+			"Chaos Ratio": 12.010,
+			"Random Rotation Ratio": 2.240,
+			"Scale Ratio": -0.610,
+			"On\\Off Random Scale": 0.0,
+			"Size of Single Square": 23,
+			"Weather Grid Size x": 33,
+			"Weather Grid Size y": 33
+		},
+		"Leafy Wind": {
+			"Weather Type": 4,
+			"Camera Rotation": "CAMERA_OBJ",
+			"Weather Folower": "FOLLOW_OBJ",
+			"Density": 0.710,
+			"Main Directioanl XYZ": [-14.32, 0, 0],
+			"Spread": 19.610,
+			"Time": 67.280,
+			"Directioanl Ratio": 16.920,
+			"Chaos Ratio": 18.570,
+			"Random Rotation Ratio": 43.330,
+			"Scale Ratio": -0.610,
+			"On\\Off Random Scale": 1.0,
+			"Size of Single Square": 23,
+			"Weather Grid Size x": 33,
+			"Weather Grid Size y": 33
+		},
+		"Firefly": {
+			"Weather Type": 5,
+			"Camera Rotation": "CAMERA_OBJ",
+			"Weather Folower": "FOLLOW_OBJ",
+			"Density": 0.080,
+			"Main Directioanl XYZ": [0, 0, 0],
+			"Spread": 67.090,
+			"Time": 383.260,
+			"Directioanl Ratio": 2.160,
+			"Chaos Ratio": 18.570,
+			"Random Rotation Ratio": 5.720,
+			"Scale Ratio": -0.610,
+			"On\\Off Random Scale": 1.0,
+			"Size of Single Square": 23,
+			"Weather Grid Size x": 33,
+			"Weather Grid Size y": 33
+		}
+	}
+}