modmuss50
|
6ab23c4c64
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13
# Conflicts:
# build.gradle
# src/main/java/techreborn/Core.java
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
# src/main/java/techreborn/blocks/BlockMachineCasing.java
# src/main/java/techreborn/blocks/cable/EnumCableType.java
# src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/command/TechRebornDevCommand.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/config/ConfigTechReborn.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
# src/main/java/techreborn/init/recipes/SmeltingRecipes.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/tiles/TileAlarm.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TileLightningRod.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
# src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
# src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/blockstates/items/materials/part.json
# src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json
|
2019-04-27 20:32:56 +01:00 |
|
Modmuss50
|
0bd22f1a55
|
Added pack count to readme
|
2019-01-19 23:58:38 +00:00 |
|
Prospector
|
c77dc683a1
|
Update README.md
|
2018-09-17 15:18:00 -07:00 |
|
Modmuss50
|
9b0f583cab
|
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin
|
2018-08-30 22:47:25 +01:00 |
|
Prospector
|
b1682ef791
|
Update README.md
|
2018-06-13 18:35:42 -07:00 |
|
Modmuss50
|
e1276a821b
|
Update to use new discord link
|
2018-04-30 18:30:09 +01:00 |
|
Modmuss50
|
258439fed2
|
Update README.md
|
2018-04-16 20:08:47 +01:00 |
|
drcrazy
|
ed473f07a4
|
Fixed typo
|
2018-04-06 01:25:59 +03:00 |
|
drcrazy
|
618f459e38
|
Added link to 1.12 dev build
|
2018-04-06 01:24:23 +03:00 |
|
Modmuss50
|
09c6b731a9
|
Update README.md
|
2017-06-29 14:41:57 +01:00 |
|
Jérémy L
|
541d3096a0
|
Little typo error in the README.md (#1080)
|
2017-05-10 19:58:06 +01:00 |
|
Modmuss50
|
b76e1d1b2f
|
Update readme to new jenkins urls.
|
2017-04-08 16:51:57 +01:00 |
|
Modmuss50
|
75859d14fb
|
Update README.md
|
2017-01-24 20:58:34 +00:00 |
|
Prospector
|
c8ebf402af
|
Update README.md
|
2017-01-04 20:30:38 -08:00 |
|
Prospector
|
18d5650c48
|
#releaseBuild
|
2017-01-01 01:18:38 -08:00 |
|
Prospector
|
6d931b232d
|
Update README.md
|
2016-12-31 00:37:34 -08:00 |
|
Prospector
|
76ebd84256
|
Update README.md
|
2016-12-31 00:36:00 -08:00 |
|
Modmuss50
|
53dd546e6f
|
Update README.md
|
2016-11-27 22:24:07 +00:00 |
|
FliegendeWurst
|
df74ca5176
|
Fix small formatting and spelling errors in readme (#807)
|
2016-11-24 19:42:22 +00:00 |
|
Modmuss50
|
c8d8ce0241
|
yeah, that doesnt work
|
2016-11-15 17:00:16 +00:00 |
|
Modmuss50
|
22b8f5bcde
|
Testing https for curse badge
|
2016-11-15 16:57:56 +00:00 |
|
Modmuss50
|
7e4b2fd40d
|
Update README.md
|
2016-09-27 19:24:33 +01:00 |
|
Modmuss50
|
0cf8ded5d1
|
Fix link
|
2016-09-23 10:05:26 +01:00 |
|
Modmuss50
|
135ef84aff
|
Update README.md
|
2016-09-23 10:04:05 +01:00 |
|
Dylan Ryman
|
f8182637ee
|
Fixed some grammar mistakes in your readme (#746)
A programmer that sees this awesome project shouldn't have their first impression ruined by obvious grammar mistakes in the readme.
|
2016-09-17 09:18:30 +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 |
|
Prospector
|
df7cd4da1a
|
Update README.md
|
2016-06-05 16:22:18 -07:00 |
|
Modmuss50
|
5e1be17e4e
|
Fix links to jenkins
|
2016-05-22 14:35:47 +01:00 |
|
modmuss50
|
0af1e97fe2
|
Add 1.9.4 build info
|
2016-05-18 17:16:46 +01:00 |
|
Modmuss50
|
5009f1ba61
|
Update README.md
|
2016-05-08 18:41:36 +01:00 |
|
Modmuss50
|
28448faf53
|
Update README.md
|
2016-05-06 11:05:24 +01:00 |
|
Modmuss50
|
9afa36ed7e
|
Fix build badges
|
2016-04-24 16:33:26 +01:00 |
|
Modmuss50
|
dc037503d7
|
Update README.md
|
2016-04-18 19:54:10 +01:00 |
|
Modmuss50
|
5cc9c8af59
|
Update README.md
|
2016-04-02 23:27:11 +01:00 |
|
Modmuss50
|
dfbc4045e6
|
Update README.md
|
2016-03-20 23:13:28 +00:00 |
|
Modmuss50
|
a594c53718
|
Update README.md
|
2016-03-19 01:11:59 +00:00 |
|
Modmuss50
|
6822c8b8f1
|
Update README.md
|
2016-03-17 11:20:45 +00:00 |
|
modmuss50
|
b9daec57f8
|
Update README.md
|
2016-03-02 16:54:40 +00:00 |
|
TheDoctorSoda
|
9e5f223a42
|
Added jackhammers
|
2016-02-28 11:18:59 -08:00 |
|
TheDoctorSoda
|
3d06e7b4e1
|
Fix solar panel bottom
|
2016-02-27 23:15:03 -08:00 |
|
modmuss50
|
9a585bcfb2
|
Merge branch '1.7.10' into 1.8.9
Conflicts:
build.gradle
src/main/java/techreborn/blocks/BlockOre.java
src/main/java/techreborn/items/ItemCells.java
|
2016-02-16 13:49:25 +00:00 |
|
Modmuss50
|
5304e38502
|
Update README.md
|
2016-01-16 13:27:11 +00:00 |
|
modmuss50
|
2a617919d9
|
Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
# Conflicts:
# src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
# src/main/java/techreborn/tiles/TileBlastFurnace.java
|
2016-01-16 13:09:09 +00:00 |
|
Modmuss50
|
c000c47f7c
|
update: Please see http://techreborn.ninja/?p=20
|
2016-01-12 19:15:22 +00:00 |
|
Modmuss50
|
efdc9db725
|
Update README.md
|
2015-12-25 22:31:11 +00:00 |
|
Modmuss50
|
f2e41cf360
|
Update README, no longer is a core mod
|
2015-11-19 19:36:45 +00:00 |
|
gigabit101
|
935a8bc382
|
Removed more junk
|
2015-10-09 22:11:04 +01:00 |
|
Modmuss50
|
9798bb106b
|
Update README.md
|
2015-10-07 09:55:15 +01:00 |
|
Modmuss50
|
1723410d17
|
Update README.md
|
2015-10-05 13:36:18 +01:00 |
|
