Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GTNewHorizons/Natura
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.5.0
Choose a base ref
...
head repository: GTNewHorizons/Natura
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 5, 2022

  1. Add IMC for selectively disabling worldgen in custom dimensions (#11)

    * Update buildscript & spotlessApply
    
    * Add IMC for selectively disabling worldgen in custom dimensions
    eigenraven authored Jul 5, 2022
    Copy the full SHA
    8c222b0 View commit details
  2. Copy the full SHA
    cdb301e View commit details

Commits on Jul 10, 2022

  1. Replace Inconsistent Textures (#13)

    Resprites of various 32 x 32 and 64 x 64 sprites found within Natura.
    FDAapproved authored Jul 10, 2022
    Copy the full SHA
    914b3b0 View commit details

Commits on Jul 16, 2022

  1. Copy the full SHA
    ea986ee View commit details

Commits on Dec 24, 2022

  1. Gunpowder (#14)

    * remove cheap gunpowder recipe
    
    * update BS+SA
    
    * remove tooltip
    
    * remove tooltip
    
    * Revert "remove tooltip"
    
    This reverts commit 8dd1973.
    
    * Revert "remove tooltip"
    
    This reverts commit 2472f7f.
    
    * Revert "remove cheap gunpowder recipe"
    
    This reverts commit 19107af.
    
    * remove recipe only in case GTNH is present
    
    * spotlessApply (#15)
    
    Co-authored-by: Martin Robertz <dream-master@gmx.net>
    Co-authored-by: GitHub GTNH Actions <>
    
    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Dream-Master and github-actions[bot] authored Dec 24, 2022
    Copy the full SHA
    6b3a714 View commit details

Commits on Jan 29, 2023

  1. Copy the full SHA
    c563066 View commit details
  2. Copy the full SHA
    f9bc7c7 View commit details
  3. Copy the full SHA
    213f4d8 View commit details

Commits on Jan 31, 2023

  1. Copy the full SHA
    77f2cbc View commit details

Commits on May 12, 2023

  1. Fix possible crash with getIcon (#16)

    * Update dependencies
    
    * Fix possible crash with getIcon
    
    * Fix formatting in readme
    
    * updateBuildScript & spotlessApply
    
    * Use devOnlyNonPublishable for NEI
    miozune authored May 12, 2023
    Copy the full SHA
    2247e0b View commit details

Commits on Jun 5, 2023

  1. Fix missing Leaf block names in WAILA (#17)

    * Update buildscript and dependencies
    
    * Fix Leaf block names in WAILA
    wlhlm authored Jun 5, 2023
    Copy the full SHA
    f829b70 View commit details

Commits on Jan 8, 2024

  1. Copy the full SHA
    1575ae9 View commit details

Commits on Jan 12, 2024

  1. update bs+deps

    Dream-Master committed Jan 12, 2024
    Copy the full SHA
    945df15 View commit details

Commits on Feb 4, 2024

  1. Copy the full SHA
    cd7da2a View commit details

Commits on Mar 12, 2024

  1. Register Natura Saplings individually (#18)

    Register Natura Saplings individually to fix GTNewHorizons/GT-New-Horizons-Modpack#15202 for Natura
    kyoi-the-fox authored Mar 12, 2024
    Copy the full SHA
    d7127bb View commit details
  2. update

    Dream-Master committed Mar 12, 2024
    Copy the full SHA
    ed90e72 View commit details

Commits on May 9, 2024

  1. Angelica/NotFine leaf render mode support (#19)

    * Simplify berry bush shouldSideBeRendered
    
    * NLeaves Angelica/NotFine leaf render mode support
    jss2a98aj authored May 9, 2024
    Copy the full SHA
    4f2dcd1 View commit details

Commits on May 10, 2024

  1. update

    Dream-Master committed May 10, 2024
    Copy the full SHA
    7c921e7 View commit details

Commits on Aug 18, 2024

  1. Fix Natura Grass not supporting plants (#20)

    * Fix Natura Grass not supporting plants
    
    * sa
    
    (cherry picked from commit e5a806c)
    
    ---------
    
    Co-authored-by: Martin Robertz <dream-master@gmx.net>
    DrParadox7 and Dream-Master authored Aug 18, 2024
    Copy the full SHA
    c744d77 View commit details
  2. Update zh_CN.lang (#22)

    Omgise authored Aug 18, 2024
    Copy the full SHA
    8ae1ffa View commit details
  3. update

    Dream-Master committed Aug 18, 2024
    Copy the full SHA
    f6820d9 View commit details
  4. fix mass recipe spam (#23)

    chochem authored Aug 18, 2024
    Copy the full SHA
    38e67bf View commit details

Commits on Sep 11, 2024

  1. Copy the full SHA
    adf9d4b View commit details
  2. update

    (cherry picked from commit 8d0bf94)
    Dream-Master committed Sep 11, 2024
    Copy the full SHA
    c32b0dc View commit details

Commits on Oct 4, 2024

  1. Remove the stickhelmet (#25)

    * remove cursed helmet sticks
    
    * and restrict oredict registration
    chochem authored Oct 4, 2024
    Copy the full SHA
    a1ff81e View commit details
  2. update

    Dream-Master committed Oct 4, 2024
    Copy the full SHA
    a882ea3 View commit details

Commits on Nov 5, 2024

  1. Copy the full SHA
    f512bc9 View commit details

Commits on Nov 7, 2024

  1. update

    Dream-Master committed Nov 7, 2024
    Copy the full SHA
    0b3012b View commit details

Commits on Jan 2, 2025

  1. Add Localizations (#27)

    glowredman authored Jan 2, 2025
    Copy the full SHA
    4f8001f View commit details

Commits on Jan 12, 2025

  1. use mc fuel calculation to fix issue with some fuels not being picked…

    … up (#28)
    
    Co-authored-by: MissBismuth <msbismuth@protonmail.com>
    MissBismuth and MissBismuth authored Jan 12, 2025
    Copy the full SHA
    0fb22c3 View commit details
  2. update

    Dream-Master committed Jan 12, 2025
    Copy the full SHA
    859b5d6 View commit details

Commits on Jan 20, 2025

  1. Copy the full SHA
    21965a4 View commit details
  2. update

    Dream-Master committed Jan 20, 2025
    Copy the full SHA
    fc5388a View commit details
Showing with 7,603 additions and 8,489 deletions.
  1. +2 −0 .git-blame-ignore-revs
  2. +44 −0 .gitattributes
  3. +0 −9 .github/scripts/test-no-crash-reports.sh
  4. +2 −34 .github/workflows/build-and-test.yml
  5. +7 −44 .github/workflows/release-tags.yml
  6. +9 −9 README.md
  7. +2 −591 build.gradle
  8. +17 −21 dependencies.gradle
  9. +167 −24 gradle.properties
  10. BIN gradle/wrapper/gradle-wrapper.jar
  11. +3 −1 gradle/wrapper/gradle-wrapper.properties
  12. +175 −111 gradlew
  13. +27 −33 gradlew.bat
  14. +0 −10 repositories.gradle
  15. +23 −0 settings.gradle
  16. +3 −3 src/main/java/mods/natura/CloudMaterial.java
  17. +104 −28 src/main/java/mods/natura/Natura.java
  18. +20 −12 src/main/java/mods/natura/blocks/CloudBlock.java
  19. +39 −27 src/main/java/mods/natura/blocks/GrassBlock.java
  20. +63 −33 src/main/java/mods/natura/blocks/GrassSlab.java
  21. +5 −4 src/main/java/mods/natura/blocks/NBlock.java
  22. +6 −6 src/main/java/mods/natura/blocks/NButton.java
  23. +7 −7 src/main/java/mods/natura/blocks/NFenceGate.java
  24. +6 −6 src/main/java/mods/natura/blocks/NLadder.java
  25. +6 −6 src/main/java/mods/natura/blocks/NPressurePlate.java
  26. +41 −80 src/main/java/mods/natura/blocks/NSlabBase.java
  27. +3 −2 src/main/java/mods/natura/blocks/NStairs.java
  28. +5 −4 src/main/java/mods/natura/blocks/NTrapdoor.java
  29. +2 −3 src/main/java/mods/natura/blocks/NaturaSnow.java
  30. +45 −0 src/main/java/mods/natura/blocks/PlankSlab1.java
  31. +45 −0 src/main/java/mods/natura/blocks/PlankSlab2.java
  32. +45 −52 src/main/java/mods/natura/blocks/crops/BerryBush.java
  33. +49 −50 src/main/java/mods/natura/blocks/crops/CropBlock.java
  34. +6 −5 src/main/java/mods/natura/blocks/crops/FlowerBlock.java
  35. +17 −18 src/main/java/mods/natura/blocks/crops/Glowshroom.java
  36. +7 −7 src/main/java/mods/natura/blocks/crops/HerbBlock.java
  37. +24 −20 src/main/java/mods/natura/blocks/crops/LargeGlowshroom.java
  38. +38 −45 src/main/java/mods/natura/blocks/crops/NetherBerryBush.java
  39. +11 −8 src/main/java/mods/natura/blocks/crops/ThornVines.java
  40. +9 −8 src/main/java/mods/natura/blocks/nether/HeatSand.java
  41. +7 −8 src/main/java/mods/natura/blocks/nether/NetherGlass.java
  42. +9 −6 src/main/java/mods/natura/blocks/nether/TaintedSoil.java
  43. +19 −10 src/main/java/mods/natura/blocks/overrides/AlternateBookshelf.java
  44. +23 −12 src/main/java/mods/natura/blocks/overrides/AlternateFence.java
  45. +1 −1 src/main/java/mods/natura/blocks/overrides/AlternatePressurePlate.java
  46. +20 −19 src/main/java/mods/natura/blocks/overrides/AlternateWorkbench.java
  47. +3 −2 src/main/java/mods/natura/blocks/overrides/NetherLever.java
  48. +5 −4 src/main/java/mods/natura/blocks/overrides/NetherrackButton.java
  49. +16 −18 src/main/java/mods/natura/blocks/tech/BlazeHopper.java
  50. +4 −6 src/main/java/mods/natura/blocks/tech/BlazeRail.java
  51. +4 −6 src/main/java/mods/natura/blocks/tech/BlazeRailDetector.java
  52. +28 −47 src/main/java/mods/natura/blocks/tech/BlazeRailPowered.java
  53. +223 −211 src/main/java/mods/natura/blocks/tech/NetherPistonBase.java
  54. +14 −12 src/main/java/mods/natura/blocks/tech/NetherPistonExtension.java
  55. +68 −114 src/main/java/mods/natura/blocks/tech/NetherrackFurnaceBlock.java
  56. +99 −242 src/main/java/mods/natura/blocks/tech/NetherrackFurnaceLogic.java
  57. +43 −32 src/main/java/mods/natura/blocks/tech/RespawnObelisk.java
  58. +64 −101 src/main/java/mods/natura/blocks/trees/DarkTreeBlock.java
  59. +0 −75 src/main/java/mods/natura/blocks/trees/FruitTreeBlock.java
  60. +229 −285 src/main/java/mods/natura/blocks/trees/LogTwoxTwo.java
  61. +32 −65 src/main/java/mods/natura/blocks/trees/NDoor.java
  62. +48 −132 src/main/java/mods/natura/blocks/trees/NLeaves.java
  63. +39 −75 src/main/java/mods/natura/blocks/trees/NLeavesDark.java
  64. +50 −76 src/main/java/mods/natura/blocks/trees/NLeavesNocolor.java
  65. +106 −158 src/main/java/mods/natura/blocks/trees/NSaplingBlock.java
  66. +26 −52 src/main/java/mods/natura/blocks/trees/OverworldLeaves.java
  67. +74 −102 src/main/java/mods/natura/blocks/trees/OverworldSapling.java
  68. +37 −50 src/main/java/mods/natura/blocks/trees/OverworldTreeBlock.java
  69. +33 −39 src/main/java/mods/natura/blocks/trees/Planks.java
  70. +117 −109 src/main/java/mods/natura/blocks/trees/SaguaroBlock.java
  71. +20 −31 src/main/java/mods/natura/blocks/trees/SimpleLog.java
  72. +52 −44 src/main/java/mods/natura/blocks/trees/TreeBlock.java
  73. +33 −52 src/main/java/mods/natura/blocks/trees/WillowBlock.java
  74. +15 −24 src/main/java/mods/natura/client/BerryRender.java
  75. +14 −19 src/main/java/mods/natura/client/CropRender.java
  76. +69 −36 src/main/java/mods/natura/client/FenceRender.java
  77. +17 −22 src/main/java/mods/natura/client/GrassColorizerAlternate.java
  78. +77 −62 src/main/java/mods/natura/client/HopperRender.java
  79. +45 −97 src/main/java/mods/natura/client/LeverRender.java
  80. +18 −11 src/main/java/mods/natura/client/NProxyClient.java
  81. +83 −94 src/main/java/mods/natura/client/SaguaroRenderer.java
  82. +9 −14 src/main/java/mods/natura/client/entity/FlameSpiderBabyRender.java
  83. +9 −14 src/main/java/mods/natura/client/entity/FlameSpiderRender.java
  84. +27 −21 src/main/java/mods/natura/client/entity/FusewoodArrowRender.java
  85. +5 −8 src/main/java/mods/natura/client/entity/ImpModel.java
  86. +3 −7 src/main/java/mods/natura/client/entity/ImpRender.java
  87. +3 −7 src/main/java/mods/natura/client/entity/NitroCreeperRender.java
  88. +958 −412 src/main/java/mods/natura/common/NContent.java
  89. +5 −5 src/main/java/mods/natura/common/NCraftingItem.java
  90. +1 −3 src/main/java/mods/natura/common/NProxyCommon.java
  91. +1 −1 src/main/java/mods/natura/common/NaturaTab.java
  92. +28 −27 src/main/java/mods/natura/common/PHNatura.java
  93. +3 −2 src/main/java/mods/natura/dimension/FireGen.java
  94. +6 −18 src/main/java/mods/natura/dimension/NetheriteChunk.java
  95. +26 −30 src/main/java/mods/natura/dimension/NetheriteChunkManager.java
  96. +161 −206 src/main/java/mods/natura/dimension/NetheriteChunkProvider.java
  97. +11 −17 src/main/java/mods/natura/dimension/NetheriteWorldProvider.java
  98. +43 −73 src/main/java/mods/natura/entity/BabyHeatscarSpider.java
  99. +167 −188 src/main/java/mods/natura/entity/FusewoodArrow.java
  100. +61 −91 src/main/java/mods/natura/entity/HeatscarSpider.java
  101. +29 −41 src/main/java/mods/natura/entity/ImpEntity.java
  102. +52 −94 src/main/java/mods/natura/entity/NitroCreeper.java
  103. +37 −73 src/main/java/mods/natura/gui/FurnaceContainer.java
  104. +14 −16 src/main/java/mods/natura/gui/FurnaceGui.java
  105. +11 −16 src/main/java/mods/natura/gui/NGuiHandler.java
  106. +31 −59 src/main/java/mods/natura/gui/WorkbenchContainer.java
  107. +16 −26 src/main/java/mods/natura/gui/WorkbenchGui.java
  108. +14 −12 src/main/java/mods/natura/items/BerryItem.java
  109. +11 −11 src/main/java/mods/natura/items/BerryMedley.java
  110. +73 −124 src/main/java/mods/natura/items/BoneBag.java
  111. +17 −20 src/main/java/mods/natura/items/BowlEmpty.java
  112. +31 −54 src/main/java/mods/natura/items/BowlStew.java
  113. +7 −7 src/main/java/mods/natura/items/CactusJuice.java
  114. +46 −55 src/main/java/mods/natura/items/ImpMeat.java
  115. +14 −22 src/main/java/mods/natura/items/NSpecialFood.java
  116. +38 −52 src/main/java/mods/natura/items/NaturaSeeds.java
  117. +101 −116 src/main/java/mods/natura/items/NetherBerryItem.java
  118. +46 −75 src/main/java/mods/natura/items/NetherFoodItem.java
  119. +45 −43 src/main/java/mods/natura/items/PlantItem.java
  120. +22 −29 src/main/java/mods/natura/items/SeedBag.java
  121. +19 −29 src/main/java/mods/natura/items/SeedFood.java
  122. +52 −66 src/main/java/mods/natura/items/SpawnEgg.java
  123. +16 −25 src/main/java/mods/natura/items/StickItem.java
  124. +43 −55 src/main/java/mods/natura/items/blocks/BerryBushItem.java
  125. +25 −28 src/main/java/mods/natura/items/blocks/CloudItem.java
  126. +21 −27 src/main/java/mods/natura/items/blocks/DarkTreeItem.java
  127. +8 −10 src/main/java/mods/natura/items/blocks/FenceItem.java
  128. +14 −17 src/main/java/mods/natura/items/blocks/GlowshroomItem.java
  129. +9 −11 src/main/java/mods/natura/items/blocks/GrassBlockItem.java
  130. +6 −16 src/main/java/mods/natura/items/blocks/GrassSlabItem.java
  131. +8 −10 src/main/java/mods/natura/items/blocks/LogTwoxTwoItem.java
  132. +4 −6 src/main/java/mods/natura/items/blocks/NAlternateItem.java
  133. +87 −103 src/main/java/mods/natura/items/blocks/NDoorItem.java
  134. +31 −34 src/main/java/mods/natura/items/blocks/NLeavesDarkItem.java
  135. +25 −28 src/main/java/mods/natura/items/blocks/NLeavesItem.java
  136. +7 −9 src/main/java/mods/natura/items/blocks/NOverrideItem.java
  137. +91 −110 src/main/java/mods/natura/items/blocks/NSaplingItem.java
  138. +41 −52 src/main/java/mods/natura/items/blocks/NetherBerryBushItem.java
  139. +19 −24 src/main/java/mods/natura/items/blocks/NetherGlassItem.java
  140. +30 −33 src/main/java/mods/natura/items/blocks/NoColorLeavesItem.java
  141. +19 −33 src/main/java/mods/natura/items/blocks/OmniShapeBlockItem.java
  142. +25 −29 src/main/java/mods/natura/items/blocks/OverworldLeavesItem.java
  143. +31 −35 src/main/java/mods/natura/items/blocks/OverworldSaplingItem.java
  144. +26 −29 src/main/java/mods/natura/items/blocks/OverworldTreeItem.java
  145. +36 −79 src/main/java/mods/natura/items/blocks/PlankSlab1Item.java
  146. +25 −70 src/main/java/mods/natura/items/blocks/PlankSlab2Item.java
  147. +55 −57 src/main/java/mods/natura/items/blocks/PlanksItem.java
  148. +25 −27 src/main/java/mods/natura/items/blocks/RedwoodItem.java
  149. +8 −10 src/main/java/mods/natura/items/blocks/SaguaroItem.java
  150. +27 −30 src/main/java/mods/natura/items/blocks/TreeItem.java
  151. +17 −20 src/main/java/mods/natura/items/blocks/WillowItem.java
  152. +36 −71 src/main/java/mods/natura/items/tools/FlintAndBlaze.java
  153. +24 −32 src/main/java/mods/natura/items/tools/FusewoodBow.java
  154. +26 −32 src/main/java/mods/natura/items/tools/NaturaArmor.java
  155. +14 −21 src/main/java/mods/natura/items/tools/NaturaBow.java
  156. +5 −4 src/main/java/mods/natura/items/tools/NaturaHatchet.java
  157. +40 −40 src/main/java/mods/natura/items/tools/NaturaKama.java
  158. +4 −3 src/main/java/mods/natura/items/tools/NaturaPickaxe.java
  159. +4 −3 src/main/java/mods/natura/items/tools/NaturaShovel.java
  160. +4 −3 src/main/java/mods/natura/items/tools/NaturaSword.java
  161. +10 −12 src/main/java/mods/natura/plugins/PluginController.java
  162. +2 −3 src/main/java/mods/natura/plugins/fmp/FMPPulse.java
  163. +8 −7 src/main/java/mods/natura/plugins/fmp/ForgeMultiPart.java
  164. +9 −9 src/main/java/mods/natura/plugins/imc/BuildCraftPulse.java
  165. +8 −12 src/main/java/mods/natura/plugins/imc/ForestryPulse.java
  166. +127 −32 src/main/java/mods/natura/plugins/imc/TreeCapitatorPulse.java
  167. +0 −1 src/main/java/mods/natura/plugins/minefactoryreloaded/MFRPulse.java
  168. +54 −35 src/main/java/mods/natura/plugins/minefactoryreloaded/MRFRegistering.java
  169. +15 −23 src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableNaturaCrop.java
  170. +7 −10 src/main/java/mods/natura/plugins/minefactoryreloaded/fertilizables/FertilizableSapling.java
  171. +12 −19 src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaBerry.java
  172. +16 −29 src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaCropPlant.java
  173. +10 −13 src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableNaturaTreeLeaves.java
  174. +12 −20 src/main/java/mods/natura/plugins/minefactoryreloaded/harvestables/HarvestableStandard.java
  175. +5 −3 src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaBerry.java
  176. +11 −5 src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaCrop.java
  177. +7 −3 src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableNaturaNetherBerry.java
  178. +9 −6 src/main/java/mods/natura/plugins/minefactoryreloaded/plantables/PlantableStandard.java
  179. +2 −3 src/main/java/mods/natura/plugins/nei/NEIPulse.java
  180. +11 −11 src/main/java/mods/natura/plugins/nei/NotEnoughItems.java
  181. +43 −20 src/main/java/mods/natura/plugins/te4/TE4Pulse.java
  182. +167 −73 src/main/java/mods/natura/plugins/thaumcraft/ThaumcraftPulse.java
  183. +20 −15 src/main/java/mods/natura/plugins/waila/NaturaCropDataProvider.java
  184. +56 −0 src/main/java/mods/natura/plugins/waila/NaturaLeavesDataProvider.java
  185. +3 −4 src/main/java/mods/natura/plugins/waila/WailaPulse.java
  186. +13 −4 src/main/java/mods/natura/plugins/waila/WailaRegistrar.java
  187. +6 −7 src/main/java/mods/natura/util/DispenserBehaviorSpawnEgg.java
  188. +13 −12 src/main/java/mods/natura/util/ICrop.java
  189. +14 −0 src/main/java/mods/natura/util/Util.java
  190. +23 −12 src/main/java/mods/natura/worldgen/BaseCloudWorldgen.java
  191. +27 −16 src/main/java/mods/natura/worldgen/BaseCropWorldgen.java
  192. +29 −12 src/main/java/mods/natura/worldgen/BaseTreeWorldgen.java
  193. +13 −20 src/main/java/mods/natura/worldgen/BerryBushGen.java
  194. +48 −60 src/main/java/mods/natura/worldgen/BloodTreeLargeGen.java
  195. +13 −8 src/main/java/mods/natura/worldgen/BushTreeGen.java
  196. +4 −4 src/main/java/mods/natura/worldgen/CloudGen.java
  197. +37 −12 src/main/java/mods/natura/worldgen/DarkwoodGen.java
  198. +49 −50 src/main/java/mods/natura/worldgen/EucalyptusTreeGenShort.java
  199. +6 −3 src/main/java/mods/natura/worldgen/FlowerGen.java
  200. +31 −14 src/main/java/mods/natura/worldgen/FusewoodGen.java
  201. +12 −8 src/main/java/mods/natura/worldgen/GlowshroomGenBlueGreen.java
  202. +56 −89 src/main/java/mods/natura/worldgen/GlowshroomGenPurple.java
  203. +53 −91 src/main/java/mods/natura/worldgen/NetherBerryBushGen.java
  204. +24 −19 src/main/java/mods/natura/worldgen/RareTreeGen.java
  205. +86 −184 src/main/java/mods/natura/worldgen/RedwoodTreeGen.java
  206. +13 −13 src/main/java/mods/natura/worldgen/SaguaroGen.java
  207. +80 −70 src/main/java/mods/natura/worldgen/SakuraTreeGen.java
  208. +77 −58 src/main/java/mods/natura/worldgen/WhiteTreeGen.java
  209. +15 −11 src/main/java/mods/natura/worldgen/WillowGen.java
  210. +7 −11 src/main/java/mods/natura/worldgen/retro/TickHandlerWorld.java
  211. +41 −38 src/main/java/mods/natura/worldgen/retro/WorldHandler.java
  212. +30 −1 src/main/resources/assets/natura/lang/en_US.lang
  213. +2 −2 src/main/resources/assets/natura/lang/zh_CN.lang
  214. BIN src/main/resources/assets/natura/textures/blocks/cotton_1.png
  215. BIN src/main/resources/assets/natura/textures/blocks/cotton_2.png
  216. BIN src/main/resources/assets/natura/textures/blocks/cotton_3.png
  217. BIN src/main/resources/assets/natura/textures/blocks/cotton_4.png
  218. BIN src/main/resources/assets/natura/textures/blocks/cotton_5.png
  219. BIN src/main/resources/assets/natura/textures/items/berry_black.png
  220. BIN src/main/resources/assets/natura/textures/items/berry_blight.png
  221. BIN src/main/resources/assets/natura/textures/items/berry_blue.png
  222. BIN src/main/resources/assets/natura/textures/items/berry_dusk.png
  223. BIN src/main/resources/assets/natura/textures/items/berry_geo.png
  224. BIN src/main/resources/assets/natura/textures/items/berry_medley.png
  225. BIN src/main/resources/assets/natura/textures/items/berry_rasp.png
  226. BIN src/main/resources/assets/natura/textures/items/berry_sky.png
  227. BIN src/main/resources/assets/natura/textures/items/berry_sting.png
  228. BIN src/main/resources/assets/natura/textures/items/cotton_plant.png
  229. BIN src/main/resources/assets/natura/textures/items/saguaro_fruit_item.png
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore spotlessApply reformat
f9bc7c72935a49883fd7b043ec443b89a522603b
44 changes: 44 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
* text eol=lf

*.[jJ][aA][rR] binary

*.[pP][nN][gG] binary
*.[jJ][pP][gG] binary
*.[jJ][pP][eE][gG] binary
*.[gG][iI][fF] binary
*.[tT][iI][fF] binary
*.[tT][iI][fF][fF] binary
*.[iI][cC][oO] binary
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary

*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
*.[mM][iI][dD][iI] binary
*.[mM][pP]3 binary
*.[oO][gG][gG] binary
*.[rR][aA] binary

*.7[zZ] binary
*.[gG][zZ] binary
*.[tT][aA][rR] binary
*.[tT][gG][zZ] binary
*.[zZ][iI][pP] binary

*.[tT][cC][nN] binary
*.[sS][oO] binary
*.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary
*.[tT][tT][fF] binary
*.[oO][tT][fF] binary

*.[pP][aA][tT][cC][hH] -text

*.[bB][aA][tT] text eol=crlf
*.[cC][mM][dD] text eol=crlf
*.[pP][sS]1 text eol=crlf

*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
9 changes: 0 additions & 9 deletions .github/scripts/test-no-crash-reports.sh

This file was deleted.

36 changes: 2 additions & 34 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Build and test

@@ -11,35 +9,5 @@ on:

jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Setup the workspace
run: ./gradlew setupCIWorkspace

- name: Build the mod
run: ./gradlew build

- name: Run server for 1 minute
run: |
mkdir run
echo "eula=true" > run/eula.txt
timeout 10 ./gradlew runServer || true
- name: Test no crashes happend
run: |
chmod +x .github/scripts/test-no-crash-reports.sh
.github/scripts/test-no-crash-reports.sh
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
secrets: inherit
51 changes: 7 additions & 44 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,14 @@
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Release tagged build

on:
push:
tags:
- '*'
tags: [ '*' ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set release version
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: gradle

- name: Grant execute permission for gradlew
run: chmod +x gradlew
permissions:
contents: write

- name: Setup the workspace
run: ./gradlew setupCIWorkspace

- name: Build the mod
run: ./gradlew build

- name: Release under current tag
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "${{ env.RELEASE_VERSION }}"
prerelease: false
title: "${{ env.RELEASE_VERSION }}"
files: build/libs/*.jar

- name: Publish to Maven
run: ./gradlew publish
env:
MAVEN_USER: ${{ secrets.MAVEN_USER }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
jobs:
release-tags:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
secrets: inherit
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#[Natura](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1294968-natura)
# [Natura](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1294968-natura)

We work all day and we work all night
The mandrake gives us quite a fright
We munch on berries high and lo
While we search for herbs to grow
We work all day and we work all night
The mandrake gives us quite a fright
We munch on berries high and lo
While we search for herbs to grow

Heyo, Redwood trees! Chop them all day long~
Heyo, Redwood trees! Chop them all day long~
Heyo, Redwood trees! Chop them all day long~
Heyo, Redwood trees! Chop them all day long~

##Development
## Development
Install Forge as usual, and setup your IDE as with any other Forge project. Forge Multipart, and CClib must be installed to `forge/mcp/jars/mods/` from the Forge File Server: [ForgeMultipart](http://files.minecraftforge.net/ForgeMultipart/) and [CClib](http://files.minecraftforge.net/CodeChickenLib/). The DEVELOPMENT version of NEI must be installed to the same directory from [Chicken Bones Site](http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php). Tinkers' Construct must be installed as well from [dvs1](https://dvs1.progwml6.com/jenkins/job/TConstruct_1.7.x/).

##Issue reporting
## Issue reporting
Please include the following:

* Minecraft version
Loading