modmuss50
fc4d8686b8
Support RC changes
2017-06-12 14:19:16 +01:00
modmuss50
e0f63fd0c5
Try and fix cable inv rendering
2017-06-12 11:17:57 +01:00
modmuss50
624d8fb93a
Remove old cables
2017-06-12 10:55:26 +01:00
modmuss50
007e8714fa
Improvements to cables.
2017-06-12 10:47:38 +01:00
modmuss50
7a8a152911
Fix GUI's having a floating button
2017-06-12 10:28:57 +01:00
modmuss50
41c94b2a52
Fix CreativeSolar panel smoking when pushing power.
2017-06-12 09:52:43 +01:00
modmuss50
06d366b941
Update Gradle + JEI compact
2017-06-12 09:48:52 +01:00
modmuss50
29cf9fa90b
1.12
2017-06-11 21:22:07 +01:00
Prospector
b6cf2a2c59
Remove a few old configs
2017-06-09 10:35:54 -07:00
Prospector
81f701477c
Fix compile
2017-06-09 08:47:44 -07:00
Prospector
2d5d60be6b
Do more configs. Still a lot to go
2017-06-09 08:31:19 -07:00
modmuss50
cba5fff3c2
Remove new cable from JEI blacklist
2017-06-09 15:11:59 +01:00
modmuss50
c7419ee8ac
Update to support new RC teir calculations
2017-06-09 14:53:24 +01:00
Prospector
2b7868c651
More configs & start fixing cable models
2017-06-08 19:12:58 -07:00
Prospector
ad36dfcddb
Started redoing config
2017-06-08 11:45:30 -07:00
modmuss50
2eac072a92
Update to fix compile issues with new JEI api
2017-06-08 11:13:01 +01:00
modmuss50
0aafea9758
Should fix issues with recipes not being removed from JEI when using CT, closes #1121 and closes #1118
2017-06-06 12:56:50 +01:00
modmuss50
968cb057e1
Fix matter fab not using all output slots, closes #1101
2017-06-02 20:36:02 +01:00
modmuss50
dd7005dc0a
Disable upgrade slots in electric furnace for now, closes #1064
2017-06-02 20:32:55 +01:00
modmuss50
f9d4134365
Start redoing Matter Fabricator gui
...
(cherry picked from commit 5c6bc6c)
2017-06-02 20:32:03 +01:00
ProfessorProspector
82927ae405
Start redoing Matter Fabricator gui
...
(cherry picked from commit 5c6bc6c)
2017-06-02 20:23:07 +01:00
modmuss50
2dffd85ccc
Fix compile errors with merge
2017-06-02 20:20:56 +01:00
modmuss50
e7813a4bed
Fix matterfab only using its first slot, closes #1076
...
(cherry picked from commit 694d1d4)
2017-06-02 20:14:18 +01:00
modmuss50
be4df1d6c9
Fixes Industrial Electrolyzer not using the ore dict closes #1022
...
(cherry picked from commit f88c25a)
2017-06-02 20:13:34 +01:00
modmuss50
d863417e7b
Hide invalid recipes when de-dupe mode is on, closes #1078
...
(cherry picked from commit 7e593bc)
2017-06-02 20:13:23 +01:00
modmuss50
0a7e6ac92f
Fixes rubber sapling model Closes #943
...
(cherry picked from commit 0e94364)
2017-06-02 20:13:12 +01:00
modmuss50
ae5b07d6bb
Fixes a handfull of recipe issues in FTB Beyond, closes #1021
...
(cherry picked from commit eef08aa)
2017-06-02 20:13:03 +01:00
modmuss50
4e47e2102e
Fix LESU, closes #999 closes #938 closes #761
2017-06-02 20:10:00 +01:00
modmuss50
2c16bf58b7
Update license header
2017-06-02 19:35:51 +01:00
modmuss50
6eae3e637e
Hide cable in JEI + update JEI compat
2017-06-02 16:24:40 +01:00
modmuss50
aa50cfa7b9
Fix minetweaker changes not showing in JEI, closes #1068
2017-06-02 16:22:07 +01:00
modmuss50
b4c873f54c
Fixes IDSU not setting the players udid when placed.
2017-06-02 16:16:34 +01:00
modmuss50
029a75522c
Add basic crafttweaker support for scrapbox
2017-06-02 16:00:07 +01:00
modmuss50
2e1de815a9
Remove achievements as they are going away in 1.12 and were broken.
2017-06-02 15:49:12 +01:00
modmuss50
a6d0e57d10
Add expensive quarry recipe back in.
2017-06-02 15:44:00 +01:00
modmuss50
3a6724b6f4
Advanced diamond drill is now 3x3
2017-05-27 01:49:07 +01:00
modmuss50
672b3ac6f1
Add basic cable textures, needs some work
2017-05-27 01:02:50 +01:00
modmuss50
b8a2d2d266
Commit uncommitted power net code
2017-05-25 20:35:36 +01:00
modmuss50
d474870977
Initial work on standalone cables.
2017-05-19 13:12:02 +01:00
modmuss50
98a3377c0c
Fix issues where the incorrect amount of power was being transfered.
2017-05-18 19:17:28 +01:00
modmuss50
8966538f1b
Some more power changes.
2017-05-18 17:19:29 +01:00
modmuss50
034ca86c79
Fix cables not receiving power correctly
2017-05-18 17:00:09 +01:00
modmuss50
aee7ca9f14
Rewrite cable logic to use FE.
...
Fixes #1077 Fixes #1071 Fixes #1067 Fixes #1070 Fixes #1059 Fixes #1044 Fixes #1041 Fixes #1025 Fixes #1006 Fixes #990 Fixes #987 Fixes #962 Fixes #955 Fixes #897
2017-05-18 16:01:18 +01:00
drcrazy
74f798e9c3
Rolling machine fixes ( #1075 )
...
* Fix for issue #942
2017-05-02 18:38:16 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support
2017-04-21 09:09:28 +01:00
ProfessorProspector
ee9e46eaa3
Clean up mcmod.info and add space to mod name
2017-04-19 19:37:07 -07:00
Dimmerworld
0bef19767d
Add tooltips for some unfinished blocks
...
* Add tooltips for some unfinished blocks
2017-04-15 18:23:21 +01:00
Dimmerworld
4d4a6e6fac
Add Glowstone grinder recipe ( #1060 )
...
* Added Glowstone dust grinder recipe
2017-04-15 08:25:20 +01:00
modmuss50
d605b7175f
Fix Server crash with last version, #releaseBuild
2017-04-14 22:33:21 +01:00
Dimmerworld
723fc1a551
Fix matter fabricator uses scrapboxs when full ( #1052 )
...
* Fix matter fabricator using scrapboxes when full
2017-04-14 09:56:11 -07:00
Dimmerworld
ff3baf46f3
Fluid textures for cells ( #1051 )
...
* Added temporary textures for all the liquids(cells)
2017-04-14 06:43:18 -07:00
Dimmerworld
16462d0dad
Spelling fixes in config and localized AverageEuOutTickTime ( #975 ) ( #1050 )
...
Fixed a number of spelling errors and added barebones information for
#975
* Fixed spelling mistake
2017-04-14 04:17:15 -07:00
Dimmerworld
b84bc89fdb
Fixed Nuke lang and added Tooltips header ( #1048 )
2017-04-14 02:49:26 -07:00
ProfessorProspector
fb888cb769
Texture changes
2017-04-13 20:54:01 -07:00
modmuss50
ef878d978d
Add warning when mod fingerprints are invalid.
2017-04-13 11:56:27 +01:00
modmuss50
995f28642a
Remove unused classes
2017-04-13 11:52:51 +01:00
modmuss50
83e904f464
Fix build
2017-04-13 11:26:16 +01:00
modmuss50
02f17871c6
Added power teir upgrades.
2017-04-12 19:58:03 +01:00
modmuss50
7ba7b2172d
Textures and lang files for the new upgrades.
2017-04-12 18:42:53 +01:00
modmuss50
1c1f540a26
Drop upgrades when machine is broken, shift right-click to add into machine.
2017-04-12 18:31:26 +01:00
modmuss50
d9af8309b1
Finished the gui, and start work on adding support for the furnace.
2017-04-12 18:04:10 +01:00
modmuss50
7541ba4dbb
Add the basic gui for side configuration
2017-04-12 16:35:56 +01:00
modmuss50
088f49c305
Allow the upgrades to be right clicked when in the gui.
2017-04-12 16:21:04 +01:00
modmuss50
5487584f04
Finish off the rendering for the upgrades.
2017-04-11 21:10:48 +01:00
modmuss50
e05c132c3a
Added basic push and pull upgrades
2017-04-11 20:42:55 +01:00
modmuss50
6355d11b0f
Add energy storage upgrades.
2017-04-11 19:26:46 +01:00
modmuss50
1ccd192790
Update to work with major RC changes.
2017-04-11 19:12:32 +01:00
modmuss50
539c5d0091
Some more work on the upgrades.
2017-04-11 14:59:59 +01:00
modmuss50
4f05367f52
Got the upgrades working, just need the textures.
2017-04-11 13:21:23 +01:00
modmuss50
c678fe7f9a
Add example speed upgrades.
2017-04-11 00:30:27 +01:00
modmuss50
0e41a97f7e
Looks like I missed a place where it was being used.
2017-04-11 00:17:52 +01:00
modmuss50
34978f7ffe
Remove old upgrade handler to make way for the new one.
2017-04-11 00:12:36 +01:00
ProfessorProspector
01d1650ebf
A few texture fixes and hide source blocks
2017-04-08 09:26:27 -07:00
modmuss50
8530cb7d7b
Load saw mill recipes later to make sure other mods have added their recipes before ours.
2017-04-08 15:58:21 +01:00
modmuss50
f2cbd23994
Find sawmill recipes from all other recipes.
2017-04-08 15:56:24 +01:00
modmuss50
21dd44def6
Increase iron furnace speed
2017-04-08 15:08:58 +01:00
modmuss50
bcfb330632
Fixes #1036
2017-04-08 15:03:46 +01:00
modmuss50
833efcd574
Fixes #1023
2017-04-08 14:52:28 +01:00
drcrazy
b136a534aa
Industrial Sawmill support for JEI done
2017-04-08 01:52:29 +03:00
drcrazy
291eadfeed
More work for Sawmill
2017-04-07 18:22:37 +03:00
drcrazy
8b4ce46e46
Initial commit for Insdustrial Sawmill JEI support
2017-04-07 02:53:09 +03:00
ProfessorProspector
94341db24a
Fix axes I broke
2017-03-30 18:56:15 -07:00
ProfessorProspector
dc638cea9c
Axes extend ItemAxe Fixes #1027
2017-03-30 18:02:58 -07:00
modmuss50
10bbdbc4d7
Fixes thermal generator crash, closes #972
...
(cherry picked from commit bb582fd)
2017-03-16 15:54:48 +00:00
modmuss50
056eff09b2
Some more improvements to the power net.
2017-03-16 13:22:17 +00:00
modmuss50
332fe1be48
Fixes crash when gem tools are disabled, closes #1008
2017-03-15 10:08:58 +00:00
modmuss50
5231e1d93b
Fix Industrial Grinder getting stuck at 100%, closes #1004
2017-03-15 09:59:23 +00:00
modmuss50
5ed6760db9
Machines no longer explode when they receive too much power, they just smoke. Fix a crash with the power net.
...
(cherry picked from commit 2ae5951)
2017-03-15 09:48:33 +00:00
modmuss50
50093455ab
Experimental changes to try and fix some issues with the power net.
...
(cherry picked from commit ad940a7)
2017-03-15 09:48:29 +00:00
modmuss50
92acc51aaf
Added a creative panel, it provides infinite power and has no recipe.
...
(cherry picked from commit 456ee3c)
2017-03-15 09:48:25 +00:00
modmuss50
da6925195b
Update CraftTweaker support
2017-03-14 12:59:17 +00:00
modmuss50
a960f1820a
Fix incorrect height when generating ores. Closes #1007
...
(cherry picked from commit d50f91d)
2017-03-14 12:42:03 +00:00
modmuss50
8b80cb7562
De-Dupe Frequency Transmitter
...
(cherry picked from commit 127df1f)
2017-03-13 11:04:25 +00:00
modmuss50
35e104d901
Fixes issue with small dust recipes, closes #1005
...
(cherry picked from commit 80a387b)
2017-03-13 11:04:17 +00:00
modmuss50
fe9d1defdc
Fix null issue with last cherry pick
2017-03-13 11:04:10 +00:00
modmuss50
bbf93c3ae3
Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.
...
Closes #1002 and Closes #822
(cherry picked from commit 93ccd8b)
2017-03-13 11:03:44 +00:00
modmuss50
76332ee946
Fixes some recipes not using the ore dict correctly.
...
(cherry picked from commit 3ee81c2)
2017-03-13 11:02:56 +00:00
modmuss50
1656b4b4a0
Remove WIP tag from charge bench as it works
...
(cherry picked from commit 3025d5c)
2017-03-13 11:01:53 +00:00
modmuss50
82c9d00f97
Added recipe for endstone dust, closes #989
...
(cherry picked from commit 96d8220)
2017-03-13 11:01:41 +00:00
modmuss50
d126edaa1b
Fixes #981
2017-02-23 12:38:36 +00:00
modmuss50
26c208e811
Added license info to the header of all files.
2017-02-23 12:29:43 +00:00
mezz
5c13230c42
Stop worldgen chunk generation runaway from rubber trees
2017-02-16 18:22:42 -08:00
mezz
6e98c7e0bc
Stop minor worldgen chunk generation runaway from iridium
2017-02-15 20:52:41 -08:00
modmuss50
2a543b4170
Fixes crash with player detectors, closes #973
...
(cherry picked from commit 58ff71b)
2017-02-13 10:30:44 +00:00
al132
d1fe85c4f3
Fix Nether Ore Gen above nether ceiling
...
Same as 1.10.2 PR
2017-02-04 21:28:36 -06:00
Ourten
57d1c60750
Fix JackHammer crash when mining blocks
2017-02-04 13:47:26 +01:00
Ourten
9847719a91
Fix automation for IndustrialGrinder and IndustrialElectrolyzer, closes #953
2017-02-03 16:57:34 +01:00
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
4ac134ef26
New textures for iridium to make it standout a bit more. Thanks @VanDerGroot
2017-02-01 17:27:41 +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
modmuss50
cb69f10c88
Fix Watermill missing texture, closes #841
2016-12-17 14:54:32 +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
3378c910a3
Fix lang
2016-12-12 16:05:32 -08: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
14c2b540f2
Modify galena texture
2016-12-11 22:12:52 -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
257a838c2c
couple more langs
2016-12-11 16:48:30 -08:00
ProfessorProspector
7b5c6a6102
Fix some lang and models
2016-12-11 16:47:28 -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
