Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

New multis 3 #93

Merged
merged 53 commits into from
Jan 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
e64595b
Add Multiblock Forge Hammer.
draknyte1 Dec 21, 2021
ccdb05c
Re-added XL Turbines.
draknyte1 Dec 22, 2021
9e9d81a
Finished work on XL turbines.
draknyte1 Dec 22, 2021
73091cf
Adjust XL Plasma Turbine recipe handling.
draknyte1 Dec 22, 2021
4577024
Add shapeless recipes to clear tanks.
draknyte1 Dec 22, 2021
c35cb87
Made tank recipes not shapeless.
draknyte1 Dec 22, 2021
fc8239f
Tweak MK4 Fusion.
draknyte1 Dec 26, 2021
d8dcc4c
Added Solar Tower & Solar Heater.
draknyte1 Jan 5, 2022
e2e6a4b
Added Asm, Screenshots and World to .gitignore.
draknyte1 Jan 6, 2022
ad828a0
Added Simple Washer mode to Industrial Wash Plant.
draknyte1 Jan 6, 2022
cdb7ff1
Finished work on multiblock Molecular Transformer.
draknyte1 Jan 6, 2022
e220989
Fix Auto-Generated ABS recipes sometimes containing two circuits.
draknyte1 Jan 6, 2022
5dda027
Made Chromatic Glass less eye-rapey.
draknyte1 Jan 6, 2022
a349f21
Finish work on the Elemental Duplicator.
draknyte1 Jan 7, 2022
c87d572
Updated Data Orb Repository tooltip.
draknyte1 Jan 7, 2022
7d0d512
Added new overlay for the Data Orb Repository.
draknyte1 Jan 7, 2022
969535e
Added some new overlays.
draknyte1 Jan 7, 2022
dfbb036
Renamed Data Orb Overlay.
draknyte1 Jan 7, 2022
5e307cc
Rewrote and readded Bronze/Advanced Workbenches using GT Meta Tile sy…
draknyte1 Jan 7, 2022
8b6ce65
Added recipes for the GT4 Workbenches.
draknyte1 Jan 7, 2022
6e865ed
Ported some GT4 content:
draknyte1 Jan 9, 2022
09ff0c1
Added more GT4 content:
draknyte1 Jan 9, 2022
2b9fea7
Improve redstone detection.
draknyte1 Jan 9, 2022
83e128a
Partially implemented Computer Cube.
draknyte1 Jan 9, 2022
7ba4c28
update dependencies
bombcar Jan 12, 2022
04bc625
Merge branch 'New-Multis-2' of https://github.com/GTNewHorizons/GTplu…
draknyte1 Jan 12, 2022
9d1e7b5
Fix https://github.com/GTNewHorizons/GTplusplus/issues/87.
draknyte1 Jan 12, 2022
ecd9b0b
Basically finished work on Reactor Simulator.
draknyte1 Jan 13, 2022
cb0277e
Hopefully make Wireless Chargers more responsive.
draknyte1 Jan 13, 2022
7477534
Change Crop Manager power usage based on feedback.
draknyte1 Jan 13, 2022
74e7627
Fix Computer Cube GUI.
draknyte1 Jan 14, 2022
b674474
Added missing recipes for Rotors and Fine Wire.
draknyte1 Jan 15, 2022
35ea58b
Added ability for GT++ Plates and Foils to be used as covers.
draknyte1 Jan 15, 2022
a69727a
Added recipes for Generator Array Controller, Multi Forge Hammer, Mul…
draknyte1 Jan 15, 2022
92a10fc
Added recipes for Solar Tower.
draknyte1 Jan 15, 2022
bee14e9
Added recipes for the XL Turbines.
draknyte1 Jan 15, 2022
10ff684
Changed Forge Hammer Meta ID to avoid conflicts.
draknyte1 Jan 15, 2022
4c52ce6
Add Average I/O stats to PSS.
draknyte1 Jan 16, 2022
84d22c4
Made Avg IO on PSS a little smarter.
draknyte1 Jan 16, 2022
48a4155
Extend PSS fake maxProgresstime to trick the system
Glease Jan 16, 2022
4ead42d
Added Recipe for Computer Cube MKII, Turbine Shaft, Rotor Assembly & …
draknyte1 Jan 16, 2022
e684491
Added GT4 Redstone Circuit Block.
draknyte1 Jan 19, 2022
d3030fa
Added textures for Redstone Circuit Block.
draknyte1 Jan 19, 2022
71fe52e
Added recipes for Redstone Circuit Block.
draknyte1 Jan 19, 2022
4f3cdc7
Fixed Industrial Forge Hammer structure check.
draknyte1 Jan 20, 2022
3caaa02
Fixed broken multiblock tooltips.
draknyte1 Jan 20, 2022
d91ba37
Improved Matter Fabricator recipes.
draknyte1 Jan 20, 2022
247a07a
Add way to make Sunnarium without MT.
draknyte1 Jan 20, 2022
8f28cbb
Did MT stuff.
draknyte1 Jan 21, 2022
0ecbbe8
Updated recipe for compressed glowstone.
draknyte1 Jan 21, 2022
7ede7c7
Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus …
draknyte1 Jan 21, 2022
03a6ace
Added CCC dep.
draknyte1 Jan 21, 2022
7e3d131
Fix fluid extraction recipes. Fixes https://github.com/GTNewHorizons/…
draknyte1 Jan 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ whitelist.json
*.iws
src/main/resources/mixins.*.json
*.bat
asm
/screenshots
/world
4 changes: 4 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ dependencies {
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev") {
transitive = false
}
compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")

compile("curse.maven:cofh-core-69162:2388751")
compile("curse.maven:advsolar-362768:2885953")

compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-70-GTNH:dev") {
transitive = false
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ autoUpdateBuildScript = false
minecraftVersion = 1.7.10
forgeVersion = 10.13.4.1614

# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
# restart Minecraft in development. Choose this dependent on your mod:
# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
developmentEnvironmentUserName = "Developer"
developmentEnvironmentUserName = Developer

# Define a source file of your project with:
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...])
# Leave these properties empty to skip individual token replacements
replaceGradleTokenInFile = CORE.java
Expand All @@ -32,7 +32,7 @@ gradleTokenModName =
gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenGroupName =

# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
apiPackage =
Expand All @@ -48,7 +48,7 @@ mixinPlugin =
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
mixinsPackage =
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
# This parameter is for legacy compatability only
# This parameter is for legacy compatibility only
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
coreModClass = preloader.asm.Preloader_FMLLoadingPlugin
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
Expand Down
Loading