Ourten
e0300d3a05
Fix nanosaber log spam
2017-02-03 14:18:15 +01:00
Ourten
08087871a1
Fix wrench drop of LightningRod, SolarPanel, WaterMill and WindMill
2017-02-02 22:28:48 +01:00
Ourten
eafc5c831d
Fix Grinder not displaying energy info
2017-02-02 22:23:00 +01:00
Jim Groth
3bee9245f8
Added grinder recipe for endstone.
2017-02-02 03:51:58 +01:00
modmuss50
5978b31dfc
Fix for iridium not spawning in stone.
2017-02-01 17:35:29 +00:00
modmuss50
2b546b1991
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff
2017-02-01 17:10:29 +00:00
modmuss50
927b99df02
Add Iridium plate recipe to ic2 compressor.
...
(cherry picked from commit 2f5817c)
2017-01-31 13:33:35 +00:00
modmuss50
f392cd4290
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff
2017-01-31 12:33:00 +00:00
modmuss50
45600ded32
Merge remote-tracking branch 'origin/1.11.2' into 1.11.2
2017-01-31 12:29:34 +00:00
modmuss50
12f23f6434
Add a recipe for clay dust into the grinder, closes #945
2017-01-31 12:29:18 +00:00
Ourten
1b084569ac
Fix recycler outputSlot
2017-01-27 01:46:16 +01:00
modmuss50
77280fad79
Fix nukes.
2017-01-26 21:44:18 +00:00
modmuss50
c058e2fbee
Fix #932
2017-01-24 21:28:54 +00:00
modmuss50
38cad3b0f1
Should remove the last few issues with the power net, closes #924 and #930
2017-01-24 21:21:02 +00:00
modmuss50
f2a3e61603
Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2
2017-01-24 21:11:37 +00:00
modmuss50
ed771a6e05
Fix rolling machine power storage value being large, closes #934
2017-01-24 21:11:27 +00:00
Ourten
ae31e8a0dc
Fix steel jackhammer config values, closes #927
2017-01-23 13:39:00 +01:00
Ourten
fea2ce5f1f
Improve FluidGenerators performance with recipes check
2017-01-19 01:12:32 +01:00
modmuss50
fb83e98707
fixes #914
2017-01-18 15:18:43 +00:00
modmuss50
4e0878b182
Move this to the correct location
2017-01-18 11:23:52 +00:00
modmuss50
0872a802da
Update to support new item power.
2017-01-18 09:55:24 +00:00
modmuss50
2c53c16010
Fixes #877
2017-01-17 22:12:30 +00:00
modmuss50
e93c580528
Fix Minetweaker issue.
2017-01-16 10:06:11 +00:00
modmuss50
a172c6aabe
Add coal to the grinder.
2017-01-16 10:03:58 +00:00
modmuss50
9e02f1ff35
Add config to disable railcraft steel recipe.
2017-01-16 10:01:00 +00:00
Ourten
64020b01e0
Fix AlloyFurnace ItemStack null reference, closes #901
2017-01-15 23:45:48 +01:00
ProfessorProspector
38525a5bb0
Multiblock work, and industrial grinder gui
2017-01-14 11:06:34 -08:00
modmuss50
84c03dbe3f
Fix MT issue, closes #888
2017-01-14 16:56:41 +00:00
modmuss50
2a632ac265
Fix some recipe issues, closes #899
2017-01-14 16:53:49 +00:00
modmuss50
2c60034a88
Update to new RebornCore. Added a config setting to disable railcrafts Iron Nugget to Steel Nugget recipe.
2017-01-11 15:33:34 +00:00
modmuss50
5588bda10b
Update to support updated recipe format in reborn core.
...
(cherry picked from commit 6aa8fde64a
2017-01-11 08:34:29 +00:00
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
modmuss50
0d22eb2c56
Fix jackhammer not breaking all rocks, closes #864
2017-01-10 19:28:12 +00:00
ProfessorProspector
af91263621
Chemical reactor GUI & a couple recipe fixes
2017-01-09 16:54:48 -08:00
ProfessorProspector
99be70713b
Recycler gui
2017-01-09 15:57:29 -08:00
ProfessorProspector
06cb13b910
useless range upgrade
2017-01-09 07:18:19 -08:00
modmuss50
b8949ee8fa
Add power net to profiling data.
2017-01-09 12:55:08 +00:00
ProfessorProspector
dc160bbd67
started with one thing...then I ended up doing a lot of shit.
2017-01-08 23:03:36 -08:00
Ourten
4e6b60e8e7
Fix tier1 machines hopper integration
2017-01-09 00:49:57 +01:00
Ourten
ac322f3e65
Fix recycler, Closes #887
2017-01-09 00:27:53 +01:00
Ourten
25e683b2e9
Fix some tiles update on clientside
2017-01-08 23:49:56 +01:00
ProfessorProspector
0c4895efa4
Electric Furnace gui!
2017-01-08 14:46:13 -08:00
ProfessorProspector
8b56947c28
Charge bench GUI
2017-01-08 14:27:45 -08:00
ProfessorProspector
eea9b83a9c
Generator gui!
2017-01-08 14:07:34 -08:00
modmuss50
2ec7340383
Added better checks to ore dict, Closes #894
2017-01-08 21:58:32 +00:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core.
2017-01-08 21:43:15 +00:00
Ourten
cd33860403
Remove comment
2017-01-08 22:34:04 +01:00
Ourten
a700d80e0f
Fix icon of SpriteSlot
2017-01-08 22:33:50 +01:00
ProfessorProspector
2a78196939
Revamp centrifuge jei support
2017-01-08 12:29:14 -08:00
Ourten
eb220643fc
Change all containers init to IContainerProvider + Add Enum for gui ids handling
2017-01-08 20:34:46 +01:00
Ourten
b93fe6c5ad
Convert FusionReactor
2017-01-08 16:32:03 +01:00
Ourten
bd16289c60
Convert IndustrialElectrolyzer, IndustrialGrinder and IndustrialSawmill
2017-01-08 16:20:13 +01:00
Ourten
b5881e2102
Convert VacuumFreezer and ImplosionCompressor
2017-01-08 16:01:24 +01:00
Ourten
ea98e4a8a0
Convert BlastFurnace
2017-01-08 15:45:05 +01:00
Ourten
665b5f7569
Convert MatterFabricator
2017-01-08 15:22:59 +01:00
Ourten
ad890079ec
Convert RollingMachine
2017-01-08 14:00:19 +01:00
Ourten
8a0a133e02
Convert AlloyFurnace and AlloySmelter
2017-01-08 13:10:13 +01:00
Ourten
619ddb14b8
Convert Scrapboxinator
2017-01-08 12:28:16 +01:00
ProfessorProspector
3c40e25b6a
Centrifuge stuff
2017-01-08 03:18:28 -08:00
ProfessorProspector
0a9a62c455
Only clear if id 0
2017-01-08 01:37:44 -08:00
ProfessorProspector
a785d2a514
Make things better
2017-01-08 01:27:18 -08:00
ProfessorProspector
32c86b535b
Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into feature/containers-builder
2017-01-07 20:59:41 -08:00
ProfessorProspector
9cbe6008c4
Fix batbox player slot positions
2017-01-07 20:25:26 -08:00
ProfessorProspector
0cccb0a91b
Merge branch 'feature/containers-builder' of https://github.com/TechReborn/TechReborn into feature/containers-builder
...
# Conflicts:
# src/main/java/techreborn/client/gui/GuiBatbox.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.java
2017-01-07 20:22:34 -08:00
ProfessorProspector
d385e6eaf4
Batbox gui overhaul
2017-01-07 20:09:46 -08:00
Ourten
b9444b5ce5
Convert recycler + Fix slot indexes
2017-01-08 02:41:50 +01:00
Ourten
d77ed99e8a
Convert AssemblingMachine
2017-01-08 02:31:37 +01:00
Ourten
35329cdc4a
Convert ChemicalReactor
2017-01-08 02:23:03 +01:00
Ourten
60c88884a7
Convert Centrifuge
2017-01-08 02:19:26 +01:00
Ourten
94a0616d8e
Add JEI transfer support for ContainerBuilder + Convert Compressor, Extractor and Grinder
2017-01-08 02:04:02 +01:00
Ourten
1df2c84e16
Convert ElectricFurnace
2017-01-07 22:11:54 +01:00
Ourten
af524f169f
Convert IronFurnace
2017-01-07 21:56:23 +01:00
Ourten
0325383d21
Convert Fluid Generators
2017-01-07 21:06:08 +01:00
Ourten
f771b7a78d
Convert Generator + Add fuelSlot
2017-01-07 20:34:03 +01:00
Ourten
53a3869092
Convert MFSU and BatBox
2017-01-07 19:12:50 +01:00
Ourten
e7eaa40bde
Add convenient energy sync method to builder + Convert MFE + Fix slots range again
2017-01-07 17:21:14 +01:00
Ourten
28c4932ef6
Fix shift slots range
2017-01-07 16:16:00 +01:00
Ourten
89d3e8538b
Cleanup some ContainerBuilder code
2017-01-07 15:59:59 +01:00
ProfessorProspector
49ae0045aa
Fix a few recipes
2017-01-07 00:29:19 -08:00
ProfessorProspector
61688e1d62
Actually call mixed metal ingot recipes #releaseBuild Fixes #890
2017-01-07 00:05:08 -08:00
ProfessorProspector
0f172ddf52
some things
2017-01-07 00:02:57 -08:00
Ourten
9f74feabff
Add container syncing helper + Rename slot builder methods
...
An example of the new syncing system can be found in the ChargeBench
2017-01-07 02:46:46 +01:00
Ourten
b688fe72e4
Fix shift-click deleting pre-existing stack
2017-01-06 22:57:40 +01:00
Ourten
728e956d69
Fix merge-shifting bypass of slot filters
2017-01-06 22:39:06 +01:00
ProfessorProspector
6acded92ed
The return of Mr. Gui Builder
2017-01-05 21:01:28 -08:00
Ourten
19cdb5b4eb
Fix shift-click bypass of slot filters + Remade ChargeBench and ChunkLoader with ContainerBuilder
2017-01-06 02:30:51 +01:00
Ourten
b70d9b41c6
Begin the ContainerBuilder system
...
Right now it doesn't do much and the internal code is quite ugly.
2017-01-06 00:43:34 +01:00
modmuss50
c3fe135498
Fixes issues with red garnets dropping, Closes #871
2017-01-05 21:26:31 +00:00
modmuss50
039cab23eb
Fixes some final issues with ic2 de-duplication, closes #875
2017-01-05 21:22:33 +00:00
ProfessorProspector
56b8b346f0
The Great Refactor of 2017 - make things more abstract
2017-01-05 13:16:51 -08:00
ProfessorProspector
e86c0d175c
The Great Refactor of 2017 - More recipes moved over!
2017-01-05 13:14:24 -08:00
modmuss50
a0c3cc644a
Add MissingIngredientExpection
2017-01-05 21:11:44 +00:00
Ourten
11c67f68a9
Fix TechReborn chests inventory capabilities. close #878
2017-01-05 00:17:53 +01:00
ProfessorProspector
2ad33bd6a9
The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient.
2017-01-04 14:19:41 -08:00
Prospector
1215c47fc2
The Great Refactor of 2017 - Extractor Recipes
2017-01-03 09:32:55 -08:00
modmuss50
eb2453480f
Remove this other event handler, and move it to RC
2017-01-03 15:13:36 +00:00
modmuss50
ab301d25db
Move multiblock event registry to reborn core
2017-01-03 15:04:30 +00:00
Prospector
bd4103b7df
The Great Refactor of 2017 - Industrial Centrifuge Recipes
2017-01-03 00:33:25 -08:00
Prospector
1831ff4dbc
The Great Refactor of 2017 - Implosion Compressor Recipes
2017-01-02 18:00:14 -08:00
modmuss50
345a319d98
WIP changes for updates MineTweaker
2017-01-02 23:41:46 +00:00
Prospector
cf6fbb5ddc
Remove debug lines and make tools children of item/handheld.
2017-01-02 15:31:28 -08:00
Prospector
f88f0f3cdb
Fix cell outputs and lang
2017-01-02 15:14:09 -08:00
Prospector
c4b003f946
Localize Compressed Air and Electrolyzed Water
2017-01-02 13:24:53 -08:00
Prospector
a29006cae2
Electrolyzed Water recipe
2017-01-02 13:20:57 -08:00
Prospector
8bd1660c41
Remove duplicate recipe and fix bonemeal recipe in electrolyzer
2017-01-02 13:18:37 -08:00
Prospector
206b20ac9e
The Great Refactor of 2017: Electrolyzer Edition
2017-01-02 13:08:58 -08:00
Prospector
007c6ca38a
Add a use for bauxite and continue the great refactor of 2017
2017-01-01 19:32:53 -08:00
Prospector
6a70424252
Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.
2016-12-31 23:29:32 -08:00
ProfessorProspector
c24116e259
Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!)
2016-12-30 23:45:42 -08:00
ProfessorProspector
9b73f20ad0
Fix lazurite plate recipe. not ready for a new build yet
2016-12-30 14:49:31 -08:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2
2016-12-27 19:47:54 +00:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/init/IC2Dict.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
ProfessorProspector
415660c988
Tweak how nugget recipes are done once again, and \o/ 2500th commit!
2016-12-22 15:12:13 -08:00
ProfessorProspector
2e9bf11569
Fix nuggets -> ingot recipes
2016-12-22 14:40:24 -08:00
ProfessorProspector
68d5a49d75
Add iridium reinforced stone & tungstensteel block recipes
2016-12-22 14:39:10 -08:00
ProfessorProspector
a446c76397
Add nuggets -> ingot and ingot -> nuggets recipes
2016-12-22 14:33:21 -08:00
al132
8306ebc72c
Fix display slots in Fusion Reactor JEI
2016-12-22 11:29:07 -06:00
ProfessorProspector
3162422ee2
remove more debug code
2016-12-21 17:12:24 -08:00
ProfessorProspector
73f362bf76
Actually fix gems ore dict
2016-12-21 17:08:13 -08:00
ProfessorProspector
2ecf8400b8
Fix red garnet drops
2016-12-21 17:03:34 -08:00
ProfessorProspector
bdde7859f9
Fix any other potential bugs with the gems or any other forgotten items from the great rename of December 2016. This day shall be known as the day that I have prevented more bugs from the 8 or so bug reports I have caused from a single line of code changed about a week ago. It was a shame that it had gotten so far, but this should make sure that it does not happen again. All ingots/gems/plates/dusts/nuggets/smalldusts now convert any camelCase input to snake_case before handling it. This is probably the longest commit message I have ever written. Closes #860
2016-12-21 16:47:53 -08:00
ProfessorProspector
948d4de3ad
Fix block ore dictionary names
2016-12-21 16:41:33 -08:00
ProfessorProspector
1759199601
Remove debug code
2016-12-21 16:22:34 -08:00
ProfessorProspector
011f164bd7
Fix gem ore dictionary entries
2016-12-21 16:20:34 -08:00
ProfessorProspector
78a3d1f589
Revert ore dictionary commit which said it fixed it but actually broke it :P #releaseBuild
2016-12-21 15:59:27 -08:00
modmuss50
7a6b3b6b48
Added a config to allow the de-duplication of ic2 items. When this is enabled TR will require you to use ic2's recipes. #releaseBuild
2016-12-21 17:57:36 +00:00
modmuss50
936ee13686
Remove last duplicated items.
2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks
2016-12-21 17:31:52 +00:00
modmuss50
10ef977fd9
Fix ore dic names, closes #853
2016-12-20 14:08:15 +00:00
modmuss50
3e6fc0647f
Fix crash with certain mods, closes #854
2016-12-20 14:02:21 +00:00
modmuss50
ca98d7d8b8
Fixes Breaking Ruby ore, closes #856 and #855
2016-12-20 14:00:58 +00:00
modmuss50
bfcc3a2117
Initial work on IC2 de-duplication
2016-12-18 21:36:29 +00:00
Ourten
c8b3568a0c
Unify TechReborn chests + Fix deep chests inventory drops
2016-12-18 22:06:07 +01:00
Ourten
da41ae7731
Apply QuantumChest fixes to DigitalChest
2016-12-18 21:34:01 +01:00
Ourten
baebc948d9
Add JEI integration for fluid generators recipes
2016-12-18 04:02:51 +01:00
Ourten
1d27182cc2
Fix FluidGenerators activation and energy production
2016-12-17 17:18:49 +01:00
Ourten
003d124667
Allow FluidGenerators to refill items with their tank
2016-12-17 16:22:31 +01:00
modmuss50
75c82353fa
Fix #843 , Some fluids dont have a texture so they wont render.
2016-12-17 15:07:03 +00:00
Ourten
97192ee3f4
Add the unified FluidGenerator recipe system + Restructure FluidGenerators tiles
...
They should all be pretty now
2016-12-17 01:25:32 +01:00
Ourten
3bf346f39a
Fix QuantumChest duplication bug and content sync
2016-12-16 21:44:32 +01:00
Ourten
f65999f960
Fix QuantumTank fluid updates
2016-12-16 15:11:46 +01:00
Ourten
1181ce49f2
Add tryAddingEnergy to ThermalGenerator to fix eternal activation with adjacent lava
2016-12-15 14:41:04 +01:00
Ourten
d727c2698b
Add tryAddingEnergy method to SemifluidGenerator
2016-12-15 14:39:53 +01:00
Ourten
487fdeddcb
Add activation state change for HeatGenerator + Cleanup side-check code
2016-12-15 14:39:27 +01:00
Ourten
a0e068cad4
Add tryAddingEnergy method to GasTurbine
...
This method will avoid blocking of the generator a little bit before it's max capacity
2016-12-15 14:36:48 +01:00
Ourten
8f0cc22472
Add activation state change to DragonEggSiphoner + Add convenient energy add method
2016-12-15 14:35:37 +01:00
Modmuss50
b67e08e267
Merge pull request #837 from Ourten/fix/energy-generators
...
Energy generators fix
2016-12-14 21:12:15 +00:00
Prospector
811d9edf54
Fix #836
2016-12-14 11:25:50 -08:00
Ourten
4c2a5b3f23
Add missing import in GasTurbine
2016-12-14 19:51:33 +01:00
Ourten
82ae50f5a8
Fix Semifluid generator activate state and fix fluid sync
2016-12-14 19:22:29 +01:00
Ourten
caf5d56e3c
Fix GasTurbine activate state and fix fluid amount sync
2016-12-14 18:36:43 +01:00
Ourten
65ec0db2de
Fix ThermalGenerator logic and packet updates
...
There is one bug left, the displayed liquid stack is always air.
2016-12-14 17:43:33 +01:00
modmuss50
57720c61de
Fix Iridum Recipe, fixes #792
2016-12-14 10:10:07 +00:00
modmuss50
32785e4f5b
Fix multiblocks, add holo renderer back, closes #802 #833 #768
2016-12-14 10:03:54 +00:00
modmuss50
4f8bfcb2df
Fix missing textures on some blocks
2016-12-14 09:41:11 +00:00
modmuss50
ccdb5c0761
Fix merge issues, fix build
2016-12-14 09:28:05 +00:00
modmuss50
c1d2e875bf
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/items/tools/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +00:00
modmuss50
47df52a7f2
Improve power transfur between items, closes https://github.com/TechReborn/TechReborn/issues/835
2016-12-14 09:13:30 +00:00
Ourten
abcef5aace
Add fluidstack info to jei recipe for IndustrialGrinder
2016-12-14 02:08:22 +01:00
modmuss50
ee96908775
Disable recipe, to fix crash with a certain set of mods. #releaseBuild
2016-12-13 19:19:12 +00:00
Thomas Guillemard
ebf569a906
Make treetap working with the IC2 rubber tree ( Fix #786 ) ( #831 )
...
Changes:
- The dependency of IC2 have been updated to the last version
- This implementation follow the original treetap logic but use
Techreborn original electrical cost.
2016-12-13 16:24:38 +00:00
modmuss50
601194685b
Merge 1.10 changes, bump version for #releaseBuild
2016-12-13 11:53:33 +00:00
modmuss50
a3b4e9de6e
Merge 1.10, bump version for #releaseBuild
2016-12-13 11:51:33 +00:00
ProfessorProspector
c271422e11
Remove deprecated empty cell
2016-12-12 15:57:04 -08:00
ProfessorProspector
de5ebf5ae3
Merge branch '1.11' of https://github.com/TechReborn/TechReborn into 1.11
2016-12-12 15:44:33 -08:00
ProfessorProspector
764396d7ef
ALL ITEMS USE JSON NOW \o/
2016-12-12 15:44:16 -08:00
modmuss50
0d7e26e74a
Remove log, and add small dusts to ore dict
2016-12-12 17:54:20 +00:00
modmuss50
29f40e1f98
Add plate recipes based of ore dic
2016-12-12 15:53:04 +00:00
modmuss50
27862b0a28
Add some more recipes listed in #818
2016-12-12 15:29:25 +00:00
modmuss50
7a4c7cfea9
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
2016-12-12 09:53:30 +00:00
modmuss50
71d8a3c7e8
Iron furnace now uses the same sides as the vanilla furnace, closes #622
2016-12-12 09:49:00 +00:00
modmuss50
59b7610227
Fix extractor recipe allowing any wood for sap extraction, close #381 again
2016-12-12 09:22:19 +00:00
ProfessorProspector
0273a619f1
Remove old jsondestroyer things
2016-12-11 23:03:51 -08:00
ProfessorProspector
a681fe4be6
Even more jsons: Cloaking device, electric treetap, lapotronic orbpack, lithium batpack, rockcutter, omnitool, manual, treetap, wrench, and refactor some model paths
2016-12-11 23:00:08 -08:00
ProfessorProspector
b3988e4c4f
Register cables in preinit, and switch cable items and storage blocks to jsons
2016-12-11 22:25:27 -08:00
ProfessorProspector
e6ba58eb45
Fusion Coils now use jsons
2016-12-11 18:22:35 -08:00
ProfessorProspector
7379e32a17
Ores use json
2016-12-11 18:05:03 -08:00
ProfessorProspector
49f227ca81
MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model
2016-12-11 17:27:39 -08:00
ProfessorProspector
8012abee3b
Move dusts and smalldusts to json
2016-12-11 11:34:56 -08:00
ProfessorProspector
3da6083c68
Nuggets now use jsons, and nuggets now return proper subtypes
2016-12-11 10:58:20 -08:00
ProfessorProspector
718fc53bbd
Let players set freq. transmitter to interactive block (shift click no longer clears on blocks) and unify tooltip
2016-12-11 10:07:56 -08:00
ProfessorProspector
ab1b1ca409
Fix #829 hopefully
2016-12-10 22:53:02 -08:00
ProfessorProspector
03b0aef687
slight adjustment #betaBuild
2016-12-10 21:56:00 -08:00
ProfessorProspector
86b98cab13
Unify tooltip messages, fix cable subtypes, and fix ruby drops
2016-12-10 18:13:27 -08:00
ProfessorProspector
61de7101c3
TOP support now changes colours based on energy system config
2016-12-10 17:15:30 -08:00
ProfessorProspector
5186f3d0ae
#releaseBuild
2016-12-10 15:04:24 -08:00
ProfessorProspector
9e3372c5aa
remove debug line
2016-12-10 15:00:53 -08:00
ProfessorProspector
d510b24599
Fix improper plate ore dictionary entries
2016-12-10 15:00:20 -08:00
ProfessorProspector
7e0b84360c
Fix ore dict recipes
2016-12-10 14:27:37 -08:00
ProfessorProspector
2911e7f0ca
Move ingots, plates, and gems to jsons
2016-12-10 00:15:39 -08:00
ProfessorProspector
89ffb5d047
More jsons!
2016-12-09 22:50:26 -08:00
ProfessorProspector
20193b562a
Switch frequency transmitter, chainsaws, drills, and jackhammers to jsons
2016-12-09 17:01:19 -08:00
ProfessorProspector
226c0bc619
Improve energy bars on items
2016-12-08 18:39:49 -08:00
ProfessorProspector
467544ebfe
Much improve the StackInfoHUD and move it to RC
2016-12-07 22:09:13 -08:00
modmuss50
24455a148c
Fix build #betabuild
2016-12-07 13:55:36 +00:00
modmuss50
3f8128d890
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
# src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
85b174929c
Disable ore validation as it was casing issues with ores in incorrect dimensions. Also add endstone to ore clear command.
2016-12-07 13:48:46 +00:00
modmuss50
0208ec58f2
Only allow correct inputs to alloy smelter, should aid with automation. closes #813
2016-12-07 13:35:51 +00:00
modmuss50
695ca83896
Fix drill recipes, closes #819
2016-12-07 13:27:20 +00:00
modmuss50
f633df81c2
Toggle facing across opposites
2016-12-07 13:22:53 +00:00
modmuss50
256b3f1b47
Allow wrench to roate energy storage devices
2016-12-07 13:18:18 +00:00
modmuss50
5dff31d937
A bunch more null check \o/
2016-12-06 18:22:18 +00:00
modmuss50
97e5fcc032
Fix #825
2016-12-06 08:23:11 +00:00
modmuss50
a42cf2990f
Fix recipes, without silicon
2016-12-05 13:04:21 +00:00
modmuss50
f07bae19bd
Fix iridium stone, remove silicon ingot.
2016-12-05 13:00:54 +00:00
modmuss50
c04a98061a
Hide Missing recipe item in JEI
2016-12-05 12:50:55 +00:00
modmuss50
8581848a16
Fix lesu storage
2016-12-05 12:48:38 +00:00
modmuss50
430a3313c4
Fix Reinforced Glass
2016-12-05 12:39:16 +00:00
modmuss50
463740ac99
Rename method to reflect the 1.11 changes.
2016-12-05 11:19:37 +00:00
modmuss50
d53f4dafc1
Added extra validation to recipe inputs and outputs, fixed one bug because of it.
2016-12-05 11:18:30 +00:00
modmuss50
75dbf2daff
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
2016-12-05 10:59:22 +00:00
modmuss50
5782d2d032
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerAlloySmelter.java
# src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
# src/main/java/techreborn/client/container/ContainerCentrifuge.java
# src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-12-05 10:57:55 +00:00
modmuss50
e6c58a04b7
Fix Lapotronic Orb
2016-12-05 10:54:46 +00:00
modmuss50
72f85d5243
Auto format code.
2016-12-05 10:48:21 +00:00
modmuss50
a96c094267
Removed un used block.
2016-12-05 10:21:17 +00:00
modmuss50
8379115c97
Fix Machine Casings
2016-12-05 10:17:39 +00:00
modmuss50
c661f6b278
Fix Machine Casing Model
2016-12-05 10:07:41 +00:00
modmuss50
2fdce5405b
Improve block names
2016-12-05 09:40:55 +00:00
modmuss50
40835a2773
Update forge version
2016-12-05 09:19:16 +00:00
brad18
02011b247a
Fixes to the Centrifuge Block ( #815 )
...
* Fixes Compressor inputting items into output slot
* Changes to Centrifuge block
Add inventory import/export via conduits etc.
Added support for overclockers.
Only allow empty cans into the correct slot and put all other items into slot 0 (ingredient slot).
Credit to Ellpeck for helping with this one.
2016-11-28 21:32:13 +00:00
modmuss50
c72c3b5851
Update JEI support, in a few places I could not figure it out, so there may be some issues.
2016-11-28 15:28:32 +00:00
modmuss50
9c33676b3d
Fix nuke texture
2016-11-28 13:05:11 +00:00
modmuss50
1dbc56f739
Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup).
2016-11-28 13:01:30 +00:00
modmuss50
83ef3e7577
Start of new texturesm, again
2016-11-28 12:54:44 +00:00
brad18
a5f306eb69
Fixes Compressor inputting items into output slot ( #812 )
2016-11-27 22:21:09 +00:00
modmuss50
54eee49e5d
Fix #810
2016-11-27 18:31:50 +00:00
modmuss50
b1b8537159
Fix log spam with some machines, closes #809 #releasebuild
2016-11-26 21:14:57 +00:00
modmuss50
7fb93e89e7
Fix #808
2016-11-26 19:15:55 +00:00
modmuss50
3a470df08b
Fix #791
2016-11-26 19:10:29 +00:00
modmuss50
129895e559
Fix #803
2016-11-26 19:05:52 +00:00
modmuss50
757e311804
Fix #804
2016-11-26 19:01:10 +00:00
modmuss50
71a5ec3e2a
Add files back, blame git
2016-11-25 13:38:17 +00:00
modmuss50
e16c3eba02
Auto format
2016-11-25 13:25:51 +00:00
modmuss50
97b233dd44
Fix resources #1
2016-11-25 13:23:42 +00:00
modmuss50
528fecc2b5
Fix a load of null issues, and get it to sort of work.
2016-11-19 16:36:13 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing
2016-11-19 14:41:00 +00:00
modmuss50
a0e6a2dc34
Start on the update
2016-11-19 12:50:08 +00:00
modmuss50
59bd497893
Fix issue with ore generation in some cases
2016-11-07 22:39:53 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
...
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
brad18
f5172ee496
Update ModRecipes.java ( #787 )
...
Brings Cupronickel heating coil recipe into line with Gregtech MC 1.4.7 and fixes #783
2016-11-06 20:14:29 +00:00
modmuss50
d9d8845d6d
Added flare, still needs some textures
2016-11-06 19:14:43 +00:00
modmuss50
d75120bb00
Give more fluids power values
2016-11-05 17:55:50 +00:00
modmuss50
9ffdc3e36e
Fix world gen issues, you may need to delete ores.hjson
2016-11-05 17:54:00 +00:00
modmuss50
b60941ddd4
Fix grinder using twice is recommended power
2016-11-05 17:36:48 +00:00
modmuss50
29b0d2443f
Large buff to power usage, should fix #769
2016-11-05 17:22:24 +00:00
modmuss50
51331b77e7
Adjust MFE and MFSU values, closes #777
2016-11-05 17:09:57 +00:00
modmuss50
0dd3b725ce
Fix recipe crash
2016-11-05 16:53:22 +00:00
modmuss50
dda189fbc6
Add Electric Treetap & Make sap go directly into inventory : From: 2aa69a1425eb8928d530c58e7c8a2495e71ea78f
2016-11-05 16:33:27 +00:00
modmuss50
f669e8b47b
Manually apply: 4fe5b68aaa100eeca675a596fcad9329403ecab8
2016-11-05 16:29:37 +00:00
ProfessorProspector
2de0ba95a6
Add ruby ore dropping garnets based on ore dict, not the ore itself. Closes #595
...
# Conflicts:
# src/main/java/techreborn/Core.java
2016-11-05 16:27:17 +00:00
ProfessorProspector
31a901cf89
fix another gem thing
2016-11-05 16:25:47 +00:00
ProfessorProspector
3073a19cfa
Fix gem tools and armour recipes
2016-11-05 16:25:32 +00:00
modmuss50
c9ff3330ca
Fix #794 , fix some issues with ic2 wrench, and use new forge perms to check when taping and wrenching blocks
2016-11-05 15:10:28 +00:00
modmuss50
916913337b
Fix #789
2016-11-05 10:43:00 +00:00
modmuss50
9af69638e2
Fix #793
2016-11-05 10:39:13 +00:00
modmuss50
73095ca198
Fix startup crash when adding some recipes.
2016-11-04 20:10:19 +00:00
modmuss50
271a8f2b2b
Fix ingot->dust dupe bug
...
Fix RC version not working in dev
2016-11-04 20:09:35 +00:00
modmuss50
19f1e71ac4
Fix #772
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:07:41 +00:00
3Pixel
3b9e48a345
Fixed the blast Furnace recipe ( #781 )
...
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:05:41 +00:00
modmuss50
96d20b7147
No longer regen ores.hjson should fix #778
2016-11-04 20:04:44 +00:00
modmuss50
cff4878eb0
Fix rubber sapling finding top most block of world to grow from. Fixes #782
2016-11-04 20:04:27 +00:00
modmuss50
603c12590d
Update to support RC 2.8
2016-11-04 20:03:05 +00:00
3Pixel
e19f1c6ca9
Fixed the blast Furnace recipe ( #781 )
...
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
2016-10-18 00:14:18 +01:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732
2016-10-08 21:56:24 +01:00
modmuss50
ee9f48bc84
Fix #772
2016-10-08 20:47:22 +01:00
modmuss50
871edce960
Fix some CME's in the powernet, and add a basic profiler to it, might add a command or someway to use this without enabling it in the code
2016-10-08 20:47:04 +01:00
modmuss50
796df6c055
Auto Format code
2016-10-08 20:46:16 +01:00
modmuss50
38f965917f
Fix Start-up crash + new version
2016-09-27 19:34:18 +01:00
modmuss50
0aaa00fd03
Version 1.4.5
2016-09-27 18:31:56 +01:00
modmuss50
f7c2d85a62
Fix #753 Stops invalid items being added to the scrapbox
2016-09-27 18:30:03 +01:00
modmuss50
ac05373963
Fix #752 Jackhammer now works on all vanilla stone types
2016-09-27 18:27:40 +01:00
modmuss50
0cfb337809
Fix #751 fix creation of invalid machine block itemstacks
2016-09-27 18:24:38 +01:00
modmuss50
7b162009c2
Hide Quantum chest and tanks when quantumstorage is loaded
2016-09-27 17:50:34 +01:00
way2muchnoise
fb6feac92f
update to JEI 3.11 ( #757 )
2016-09-27 17:03:57 +01:00
modmuss50
a5550b9bb4
Fix a load of issues
2016-09-19 20:58:34 +01:00
modmuss50
0f8bb12fea
Fix missing gui textures
2016-09-19 20:21:47 +01:00
modmuss50
281537a417
Added rubber to ore dic
2016-09-18 20:56:29 +01:00
modmuss50
edf266588f
Fix wrench recipe issues
...
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
modmuss50
0a2e878b88
Fix #738
2016-09-07 08:21:42 +01:00
modmuss50
aefe9f6a36
Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2
2016-09-06 22:16:29 +01:00
modmuss50
d5ff2a42bb
Fixes #723 and wrench works with ic2 machines now
2016-09-06 22:16:21 +01:00
Utoc
2ae38dea9e
Slot index changes ( #734 )
...
Changes slot index values to allow machines to be pulled from.
2016-08-27 08:02:44 +01:00
Zygimantas
bda861454c
fixed #722 ( #729 )
...
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust
* referenced to issue #484 , fixed #1 , #3 , #6 , #7
* Fixed #722 with a null ore check
2016-08-10 21:57:38 +01:00
Zygimantas
cf46fea074
Electrolyzer recipes ( #728 )
...
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust
* referenced to issue #484 , fixed #1 , #3 , #6 , #7
2016-08-10 20:33:49 +01:00
modmuss50
d96149fc97
Revert "Power system re-write, recipe fixes."
...
This reverts commit d982cc4028
2016-08-10 00:51:44 +01:00
modmuss50
aa05d906f9
Revert "Wires now transfer energy from all mods and manages it as EU. ( #686 )"
...
This reverts commit 6f54e3801f
2016-08-10 00:45:33 +01:00
modmuss50
cdae866b2d
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
...
This reverts commit b292fdd352
2016-08-10 00:45:07 +01:00
modmuss50
9b882e75ce
Revert "Bump version number & small NPE fix."
...
This reverts commit 8a053117c6
2016-08-10 00:32:43 +01:00
modmuss50
e3384e3266
Revert "Small order fix."
...
This reverts commit 74e0c3669f
2016-08-10 00:30:23 +01:00
modmuss50
575773a6b3
Revert "RF wires fix."
...
This reverts commit fe64b8ccf7
2016-08-10 00:30:16 +01:00
modmuss50
8a0d981018
Revert "Fusion reactor fixes & rewrite, energy fixes."
...
This reverts commit 06fad2264f
2016-08-10 00:30:08 +01:00
modmuss50
22fd152ec9
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
...
This reverts commit be4f10b975
2016-08-10 00:29:47 +01:00
Nico
9a73c3321e
First few Fixes ( #707 )
...
* Fixed missing translations
The Plates were only typos...
* Removed old textures
* Added new textures
* Fixed typo for texture
2016-08-02 00:35:00 +01:00
modmuss50
bbc5a636f1
Added ore vein config
2016-08-01 15:30:55 +01:00
Dragon2488
f03fbef70e
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
2016-08-01 21:00:30 +07:00
Dragon2488
42d051cda3
Veins ore generation + fixes.
2016-08-01 20:59:20 +07:00
modmuss50
cb44c79256
Remove needed block, update forge
2016-08-01 09:37:55 +01:00
Dragon2488
25e709239f
Oops
2016-08-01 01:25:42 +07:00
Dragon2488
c8301e4db3
Veins ore generation system. WIP.
2016-08-01 01:12:55 +07:00
Andrew Burns
5898de8d8f
Fix typo in config file ( #701 )
...
Client was spelt wrong
2016-07-30 15:30:11 -07:00
Dragon2488
7f02559357
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
2016-07-29 01:52:08 +07:00
Dragon2488
5af14bbf01
Grinder recipes fixes and auto-generation for ores, gems and ingots through ore dictionary
2016-07-29 01:28:59 +07:00
Dragon2488
a5a9460707
Automation fixes, upgrades fixes.
2016-07-27 17:51:03 +07:00
laz2727
99057a8e8e
Fix Tinkers Construct crashing
...
Probably.
2016-07-25 20:27:33 +04:00
Dragon2488
be4f10b975
Energy storages item charging fixes, transformers fixes, electric items fixes.
2016-07-25 15:10:55 +07:00
Dragon2488
b42b5274b5
Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix.
2016-07-25 02:26:15 +07:00
Dragon2488
0011553cf7
Sawmill changes & fixes.
2016-07-24 01:10:37 +07:00
Dragon2488
06fad2264f
Fusion reactor fixes & rewrite, energy fixes.
2016-07-22 21:45:55 +07:00
Dragon2488
fe64b8ccf7
RF wires fix.
2016-07-22 01:46:43 +07:00
Dragon2488
74e0c3669f
Small order fix.
2016-07-22 01:03:36 +07:00
Dragon2488
8a053117c6
Bump version number & small NPE fix.
2016-07-22 00:21:32 +07:00
Dragon2488
b292fdd352
Rewrite to use new RebornCore Power API. Texture fixes.
2016-07-21 22:22:56 +07:00
Archengius
6f54e3801f
Wires now transfer energy from all mods and manages it as EU. ( #686 )
...
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.
* Fix TechReborn to work with latest RebornCore
2016-07-21 07:51:55 -07:00
modmuss50
10aa2f2ffb
fix merge
2016-07-19 11:46:53 -07:00
al132
aa8fbbb7bc
Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerExtractor.java
2016-07-19 00:21:18 -05:00
al132
f4cd3fc818
Leaves Constructor reverted
2016-07-18 23:37:02 -05:00
al132
7a6df30d10
Rubber and recipe fixes
2016-07-18 23:26:41 -05:00
Dragon2488
d982cc4028
Power system re-write, recipe fixes.
...
Please note that this version breaks all wires placed in worlds before.
2016-07-18 11:57:52 +07:00
al132
166f9a924f
Fixed Output of extractor ( #679 )
...
* Add CraftTweaker support for the Compressor
* Fix Extractor insertion and extraction
* Oops
2016-07-18 02:06:47 +01:00
al132
84b5de3417
Oops
2016-07-17 17:38:10 -05:00
al132
9e2c23d04a
Fix Extractor insertion and extraction
2016-07-17 17:36:40 -05:00
al132
48cbda6453
Add CraftTweaker support for the Compressor ( #677 )
2016-07-17 21:31:56 +01:00
al132
ea74721945
Add CraftTweaker support for the Compressor
2016-07-17 15:19:31 -05:00
modmuss50
fbc0d32407
Fix rare crash with the power net
2016-07-16 23:44:42 +01:00
modmuss50
adf9b8c0e4
Fix #676
2016-07-16 22:16:22 +01:00
Dragon2488
25c581e129
Recipe fixes.
2016-07-16 22:17:44 +07:00
Dragon2488
33df1d3319
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. ( #673 )
2016-07-16 10:44:54 +01:00
Prospector
ddb96d58ec
Merge pull request #672 from Dragon2488/1.9.4
...
Properly integration with IC2 through ore dictionary. JEI recipes...
2016-07-15 04:05:16 -07:00
Dragon2488
1f197c3728
Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions.
2016-07-15 17:28:41 +07:00
Prospector
31d1afa044
Merge pull request #671 from Dragon2488/1.9.4
...
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability…
2016-07-14 22:39:43 -07:00
Dragon2488
2b148f3d68
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid.
2016-07-15 12:15:09 +07:00
al132
01516c93a3
Fix CraftTweaker compatibility
...
A version of CraftTweaker that is compatible with 1.9.4 has been
released since the Minetweaker/CraftTweaker dependency was removed. I
have restored compatibility with the new version of CraftTweaker
2016-07-14 17:15:36 -05:00
modmuss50
7719633599
Added compatibility for 1.10
2016-07-01 15:58:15 +01:00
modmuss50
fa9e941217
Update JEI
2016-07-01 15:55:44 +01:00
modmuss50
315c0aa509
Revert "Revert a shit load of stuff"
...
This reverts commit d25bb23e8e
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e
Revert a shit load of stuff
2016-07-01 15:40:46 +01:00
modmuss50
be336ec249
Fix ChargeHud
2016-06-06 20:22:56 +01:00
modmuss50
2c6cc4b298
Clean up ic2 recipes a little
2016-06-06 19:59:10 +01:00
modmuss50
7d0943ea5b
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:55:04 +01:00
modmuss50
9c0f0fa111
Started work on the recipe links
2016-06-06 19:52:46 +01:00
modmuss50
973f68496c
Merge branch '1.9.4' into 1.9.4-ic2
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:02:19 +01:00
onVoid
039aab3e41
Added grinder recipes for gems -> dust ( #628 )
2016-06-05 22:05:44 +01:00
modmuss50
55e6f70900
Fix last PR
2016-06-05 20:41:54 +01:00
Modmuss50
d5e83cacb6
Merge pull request #626 from onVoid/patch-1
...
Added grinder recipes for ingot -> dust
2016-06-05 20:38:44 +01:00
modmuss50
d84bffce46
Fix nanosaber
2016-06-05 20:37:22 +01:00
onVoid
83e116f4b5
Added grinder recipes for ingot -> dust
2016-06-05 12:36:39 -07:00
modmuss50
895319ed67
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
2016-06-05 19:43:28 +01:00
modmuss50
4d29af274e
Balance power recipes
2016-06-05 19:43:17 +01:00
Prospector
b7e6e109aa
Nanosaber still don't work
2016-06-05 10:41:00 -07:00
Prospector
4c01fa8864
Started work on fixing nanosaber
2016-06-05 03:57:38 -07:00
