Merge branch '1.11' into 1.12

CHANGELOG.md

@@ -2,6 +2,32 @@
 
 Blockbuster's change log.
 
+## Version 1.6.6
+
+This is another patch update which fixes lots of bugs. Beside bug fixes, there are also new BB gun options which allows for a better projectile configuration. Andruxioid also introduces Ukranian translation in this update!
+
+**Compatible** with McLib `1.0.4`, Metamorph `1.1.10` and Aperture `1.3.5`. It doesn't mean that future versions of Metamorph and Aperture would be incompatible, but older versions are most likely incompatible.
+
+* Added `ua_UA` (Ukranian) language localization (translated by Andruxioid)
+* Added an ability to use decimals for countdown
+* Added BB gun sticking option
+* Added BB gun bounce factor option
+* Added default variant of image morph
+* Added pausing keybind to playing keybind (suggested by SillySheep)
+* Added pick skin button in the model editor
+* Changed recording countdown to `1.5` seconds by default
+* Changed places pick skin and pick model (suggested by Tossler)
+* Fixed a crash with unknown action type (reported by zoombie)
+* Fixed model files not being copied over (reported by Sbriser)
+* Fixed player recordings being unloaded during camera editor (reported by Koki)
+* Fixed materials not supporting GIF textures (reported by SillySheep)
+* Fixed OBJ meshes with the same name not getting merged into single mesh
+* Fixed sequencer morph merging when they're the same (doesn't work in some cases due to Metamorph's code)
+* Fixed lying pose has incorrect Y position for \*wears (reported by Tossler)
+* Fixed old `vox` models that don't have the scene graph to get loaded (reported by Mayd and Murply)
+* Fixed director block's block morph not appearing correctly
+* Removed old commands (`/model texture` and `/model replace_texture`)
+
 ## Version 1.6.5
 
 This is a little update features two neat features, and mostly bug fixes. A couple of things to note about this update:

README.md

@@ -17,9 +17,15 @@ If you're interested in any aspect of Minecraft machinimas, roleplays or animati
 
 Beside that, MachinimaHub has lots of Blockbuster users, so if you need any help feel free to hop on the server!
 
+## Install
+
+Install [Minecraft Forge](http://files.minecraftforge.net/), download the latest stable version of jar file for available Minecraft version. Also install following mods: [McLib](https://minecraft.curseforge.com/projects/mchorses-mclib), and [Metamorph](https://minecraft.curseforge.com/projects/metamorph). Put it in minecraft's `mods` folder, and launch the game.
+
+After that, Blockbuster mod should be installed and will appear in Minecraft's mods menu. If Blockbuster didn't appear in the mods menu, then something went wrong.
+
 ## FAQ
 
-**Q: Model block is invisible when I hold it in the hand. How to fix it? (1.12.2)**  
+**Q: Model block is invisible when I hold it in the hand. How to fix it? (1.12.2)**
 A: Looks like you're using Optifine D1 or below. Update Optifine to D2 or higher.
 
 ## Features
@@ -46,12 +52,6 @@ Blockbuster mod provides you with lots of features to create outstanding machini
 * **[Minema](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2790594-minema-unofficial-the-smooth-movie-recorder) compatability** – thanks to frame-based player recording and cameras, you can convert your in-game machinimas to videos with a press of a button.
 * **Speaks multiple languages** – besides English, Blockbuster is also translated into Russian and Chinese thanks to [Andruxioid](https://www.youtube.com/channel/UCnHOceBjwMyqCR5oYOoNqhQ) and [ycwei982](https://www.youtube.com/channel/UCfUDMSGlXUblXimkvNl_7Ww), respectively.
 
-## Install
-
-Install [Minecraft Forge](http://files.minecraftforge.net/), download the latest stable version of jar file for available Minecraft version. Also install following mods: [McLib](https://minecraft.curseforge.com/projects/mchorses-mclib), and [Metamorph](https://minecraft.curseforge.com/projects/metamorph). Put it in minecraft's `mods` folder, and launch the game.
-
-After that, Blockbuster mod should be installed and will appear in Minecraft's mods menu. If Blockbuster didn't appear in the mods menu, then something went wrong.
-
 ## Videos
 
 ### Tutorial videos

src/main/java/mchorse/blockbuster/client/render/RenderCustomModel.java

@@ -121,7 +121,8 @@ protected void renderLivingAt(EntityLivingBase entityLivingBaseIn, double x, dou
     {
         super.renderLivingAt(entityLivingBaseIn, x, y, z);
 
-        if (!this.captured) {
+        if (!this.captured)
+        {
             this.captured = MatrixUtils.captureMatrix();
         }
     }

version.json

@@ -1,6 +1,7 @@
 {
     "homepage": "https://curseforge.com/minecraft/mc-mods/blockbuster/",
     "1.10.2": {
+        "1.6.6": "This is another patch update which fixes lots of bugs. Beside bug fixes, there are also new BB gun options which allows for a better projectile configuration. Andruxioid also introduces Ukranian translation in this update!",
         "1.6.5": "This is a little update features two neat features, and mostly bug fixes.",
         "1.6.4": "This is a quick hot patch update which fixes a couple of major issues I found after releasing 1.6.3, my bad guys...",
         "1.6.3": "This update introduces native support for MagicaVoxel (`*.vox`) models, Scenes (remote director blocks which are stored in files and managed in GUI), many new options, a couple of nice tweaks and workflow enhancements and, as always, bug and crash fixes.",
@@ -14,6 +15,7 @@
         "1.4.10": "Patch 1.4.10 adds few nice misc. features (model block and OBJ loading without JSON model) which generally should improve UX a bit and simplify decorating set with Blockbuster models/Metamorph morphs, and lay down a foundation for future new features (which involves removing old useless code)."
     },
     "1.11.2": {
+        "1.6.6": "This is another patch update which fixes lots of bugs. Beside bug fixes, there are also new BB gun options which allows for a better projectile configuration. Andruxioid also introduces Ukranian translation in this update!",
         "1.6.5": "This is a little update features two neat features, and mostly bug fixes.",
         "1.6.4": "This is a quick hot patch update which fixes a couple of major issues I found after releasing 1.6.3, my bad guys...",
         "1.6.3": "This update introduces native support for MagicaVoxel (`*.vox`) models, Scenes (remote director blocks which are stored in files and managed in GUI), many new options, a couple of nice tweaks and workflow enhancements and, as always, bug and crash fixes.",
@@ -27,6 +29,7 @@
         "1.4.10": "Patch 1.4.10 adds few nice misc. features (model block and OBJ loading without JSON model) which generally should improve UX a bit and simplify decorating set with Blockbuster models/Metamorph morphs, and lay down a foundation for future new features (which involves removing old useless code)."
     },
     "1.12.2": {
+        "1.6.6": "This is another patch update which fixes lots of bugs. Beside bug fixes, there are also new BB gun options which allows for a better projectile configuration. Andruxioid also introduces Ukranian translation in this update!",
         "1.6.5": "This is a little update features two neat features, and mostly bug fixes.",
         "1.6.4": "This is a quick hot patch update which fixes a couple of major issues I found after releasing 1.6.3, my bad guys...",
         "1.6.3": "This update introduces native support for MagicaVoxel (`*.vox`) models, Scenes (remote director blocks which are stored in files and managed in GUI), many new options, a couple of nice tweaks and workflow enhancements and, as always, bug and crash fixes.",
@@ -40,11 +43,11 @@
         "1.4.10": "Patch 1.4.10 adds few nice misc. features (model block and OBJ loading without JSON model) which generally should improve UX a bit and simplify decorating set with Blockbuster models/Metamorph morphs, and lay down a foundation for future new features (which involves removing old useless code)."
     },
     "promos": {
-        "1.10.2-latest": "1.6.5",
-        "1.10.2-recommended": "1.6.5",
-        "1.11.2-latest": "1.6.5",
-        "1.11.2-recommended": "1.6.5",
-        "1.12.2-latest": "1.6.5",
-        "1.12.2-recommended": "1.6.5"
+        "1.10.2-latest": "1.6.6",
+        "1.10.2-recommended": "1.6.6",
+        "1.11.2-latest": "1.6.6",
+        "1.11.2-recommended": "1.6.6",
+        "1.12.2-latest": "1.6.6",
+        "1.12.2-recommended": "1.6.6"
     }
 }