modmuss50
|
b41472089c
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
Conflicts:
build.gradle
|
2016-03-22 11:39:20 +00:00 |
|
modmuss50
|
3d8c63e1f2
|
Clean up maven repos
|
2016-03-22 11:38:41 +00:00 |
|
Modmuss50
|
2afb906775
|
Update build.gradle
|
2016-03-22 00:48:46 +00:00 |
|
modmuss50
|
cb42f452c4
|
Update MCMP
|
2016-03-21 15:32:35 +00:00 |
|
modmuss50
|
492917ac95
|
Improvements to cable rendering. still broken, but not as bad
|
2016-03-20 10:58:58 +00:00 |
|
modmuss50
|
471a945de6
|
Its all broke, mcmultipart support
|
2016-03-19 18:01:34 +00:00 |
|
modmuss50
|
f255137753
|
Official forge
|
2016-03-18 11:08:30 +00:00 |
|
modmuss50
|
2bbc785dde
|
Re-added JEI support, and update things
|
2016-03-18 08:29:29 +00:00 |
|
modmuss50
|
daa2397d0e
|
Updates to gradle file
|
2016-03-16 20:50:37 +00:00 |
|
modmuss50
|
9a23c5d437
|
Update Mappings
|
2016-03-16 08:33:11 +00:00 |
|
modmuss50
|
9a40abbe78
|
Now comes the grind, 244 errors left
|
2016-03-13 16:08:30 +00:00 |
|
modmuss50
|
7e5e40a338
|
Added machine teirs (can someone check them)
Fixed crash when machines explode
|
2016-03-08 17:34:04 +00:00 |
|
modmuss50
|
57f91f3159
|
Cables now shock the entity's
|
2016-03-06 21:42:27 +00:00 |
|
modmuss50
|
5ed5aeea54
|
Revert "Gradle 2.11"
This reverts commit c8453292b4 .
|
2016-03-02 16:35:03 +00:00 |
|
modmuss50
|
e680f3fb1f
|
Updates, and re added support
|
2016-02-29 11:20:40 +00:00 |
|
modmuss50
|
b0cb4f87c5
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
# Conflicts:
# src/main/java/techreborn/items/tools/ItemWrench.java
|
2016-02-29 08:15:23 +00:00 |
|
modmuss50
|
3f02e36690
|
update BOP
|
2016-02-29 08:13:40 +00:00 |
|
modmuss50
|
f9f460207e
|
Java 1.8
|
2016-02-28 17:00:27 +00:00 |
|
modmuss50
|
d30b69c88d
|
Remove test as it is pointless
|
2016-02-26 21:54:22 +00:00 |
|
modmuss50
|
c8453292b4
|
Gradle 2.11
|
2016-02-24 11:05:28 +00:00 |
|
modmuss50
|
de9daec7a8
|
Changes to support new jenkins
|
2016-02-23 21:59:06 +00:00 |
|
modmuss50
|
71c2bfee7f
|
Moved power system to RC and spawn trees in groups
|
2016-02-20 16:59:31 +00:00 |
|
mezz
|
a1ef232b38
|
Update JEI, minor clean up of JEI integration
|
2016-02-17 23:44:15 -08:00 |
|
modmuss50
|
fb1d6f1074
|
Version 0.7.11
|
2016-02-16 22:05:43 +00:00 |
|
Modmuss50
|
ca693fbc8e
|
Version 0.7.10
|
2016-02-13 09:10:56 +00:00 |
|
Modmuss50
|
484fec1680
|
Update build.gradle
|
2016-02-13 09:06:18 +00:00 |
|
modmuss50
|
99d69f3cbb
|
Update to new RF API, closes #335
|
2016-02-10 13:15:02 +00:00 |
|
modmuss50
|
284e5d1d51
|
Add mc version to jar name
|
2016-02-09 17:43:46 +00:00 |
|
modmuss50
|
8ec95f9119
|
Now using new Forge Dynamic buckets, and prep for new update
|
2016-02-02 21:05:42 +00:00 |
|
mezz
|
e4af69e861
|
Update JEI & Forge, add recipe click areas and rolling machine transfer
|
2016-02-01 17:59:23 -08:00 |
|
Modmuss50
|
e04a4a540f
|
Prep for update for new reborn core
|
2016-01-24 11:37:43 +00:00 |
|
modmuss50
|
7e7ad74203
|
Squashed commit of the following:
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date: Fri Jan 22 13:38:27 2016 +0000
Rename to fix spelling issue
commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date: Fri Jan 22 13:27:15 2016 +0000
Update to new JSON-Destoryer version
commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date: Wed Jan 20 17:27:41 2016 +0000
Update to new json destroyer
|
2016-01-22 13:39:20 +00:00 |
|
modmuss50
|
7139a62102
|
Update to fixed Reborn core and bump version
|
2016-01-13 13:40:02 +00:00 |
|
modmuss50
|
a9a85bcd84
|
Now use none dev version of RebornCore
|
2016-01-13 11:13:38 +00:00 |
|
modmuss50
|
fbe51d98cd
|
update forge
|
2016-01-13 11:07:47 +00:00 |
|
Modmuss50
|
6c3e0e47c3
|
Update build.gradle
|
2016-01-07 11:03:49 +00:00 |
|
mezz
|
a00543c67d
|
Update to latest JEI
|
2016-01-06 00:46:23 -08:00 |
|
Modmuss50
|
01dfab2031
|
Update build.gradle
|
2016-01-01 21:33:13 +00:00 |
|
mezz
|
d1b4fe3027
|
update JEI version
|
2016-01-01 13:18:42 -08:00 |
|
mezz
|
5addee32e6
|
Add grinder recipes
|
2015-12-31 00:56:09 -08:00 |
|
modmuss50
|
dc7e565455
|
Update RebornCore
|
2015-12-31 00:03:17 +00:00 |
|
modmuss50
|
d5b4bbbad8
|
update BiomesOPlenty
|
2015-12-30 23:57:58 +00:00 |
|
modmuss50
|
1c28fa6e0a
|
Revert "Disable BOP support to try and fix gradle crash"
This reverts commit 13f3d5757f .
|
2015-12-30 23:57:06 +00:00 |
|
modmuss50
|
6faa7a77ce
|
bump version
|
2015-12-30 17:23:45 +00:00 |
|
modmuss50
|
13f3d5757f
|
Disable BOP support to try and fix gradle crash
|
2015-12-30 17:17:16 +00:00 |
|
modmuss50
|
7240fef301
|
mod updates
|
2015-12-30 17:13:56 +00:00 |
|
modmuss50
|
54817286e6
|
Revert "test to fix build issue"
This reverts commit eed1a7a719 .
|
2015-12-30 17:09:17 +00:00 |
|
modmuss50
|
0c7f07001b
|
temp remove jei support to track down build issue.
|
2015-12-30 17:06:24 +00:00 |
|
modmuss50
|
eed1a7a719
|
test to fix build issue
|
2015-12-30 16:38:52 +00:00 |
|
modmuss50
|
895d5cfdd9
|
1.8.9 update
|
2015-12-30 11:57:06 +00:00 |
|
modmuss50
|
b2cd388527
|
remove this for later
|
2015-12-28 11:08:14 +00:00 |
|
modmuss50
|
d973d6b108
|
Added back some more compat
|
2015-12-28 10:57:22 +00:00 |
|
modmuss50
|
48a94205e2
|
Merge branch 'master' into 1.8.8
# Conflicts:
# build.gradle
|
2015-12-19 09:53:54 +00:00 |
|
Modmuss50
|
024a13375e
|
Version 0.7.4
|
2015-12-19 09:52:00 +00:00 |
|
modmuss50
|
8e3136ecf0
|
Update deps, for #307
|
2015-12-18 18:56:45 +00:00 |
|
Modmuss50
|
b924b3f36d
|
Version 0.7.3
|
2015-12-14 11:08:11 +00:00 |
|
Modmuss50
|
abcaccdc82
|
Added waila support back
|
2015-12-13 19:41:46 +00:00 |
|
Modmuss50
|
67d2d9c863
|
Update reborn core
|
2015-12-13 18:09:48 +00:00 |
|
modmuss50
|
3b3deea57b
|
update things
|
2015-12-13 13:29:15 +00:00 |
|
modmuss50
|
fb6b5135e4
|
Merge branch 'master' into 1.8.8
# Conflicts:
# ToAddBack/partSystem/parts/CablePart.java
|
2015-12-12 17:39:23 +00:00 |
|
Modmuss50
|
cf3d795c27
|
Version 0.7.2
|
2015-12-12 17:38:18 +00:00 |
|
Modmuss50
|
f4a8c3519a
|
Should fix build
|
2015-12-11 19:54:58 +00:00 |
|
modmuss50
|
c782b78959
|
Fixed build errors
|
2015-12-06 10:32:32 +00:00 |
|
modmuss50
|
ba90e49822
|
updated JEI, and improved support
|
2015-12-05 22:48:11 +00:00 |
|
modmuss50
|
5cf116d8a4
|
Missed conflict when merging
|
2015-12-05 20:32:18 +00:00 |
|
modmuss50
|
40f78c3938
|
Merge branch 'master' into 1.8.8
Conflicts:
build.gradle
|
2015-12-05 20:30:20 +00:00 |
|
Modmuss50
|
7c039f3105
|
Now build against java 1.7
|
2015-12-05 20:27:57 +00:00 |
|
modmuss50
|
8d0cc231d6
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-12-05 20:23:52 +00:00 |
|
modmuss50
|
cf36bc9dc1
|
Fixes #293 and removed java doc
|
2015-12-05 20:23:40 +00:00 |
|
modmuss50
|
a795f90971
|
Update forge, fix ticking tiles.
|
2015-12-05 20:14:32 +00:00 |
|
Modmuss50
|
60d7b63d5b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8
# Conflicts:
# build.gradle
|
2015-11-29 12:29:42 +00:00 |
|
modmuss50
|
3fb7dd102b
|
Inital Just Enough Items support
|
2015-11-29 10:42:34 +00:00 |
|
modmuss50
|
3367e990be
|
Update to new forge and mappings
|
2015-11-29 09:52:45 +00:00 |
|
Modmuss50
|
86b60385c0
|
Update RebornCore
|
2015-11-29 09:38:37 +00:00 |
|
modmuss50
|
c02269f4d6
|
Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8
|
2015-11-28 12:52:04 +00:00 |
|
modmuss50
|
d5e2628f7a
|
Some small tweaks
|
2015-11-28 12:51:49 +00:00 |
|
Modmuss50
|
708fb8afbd
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 1.8.8
|
2015-11-28 12:35:52 +00:00 |
|
Modmuss50
|
1dd47833c2
|
Version 0.7.1
|
2015-11-28 12:32:44 +00:00 |
|
modmuss50
|
ae5bb56445
|
Update build.gradle
|
2015-11-27 20:56:31 +00:00 |
|
Modmuss50
|
d452ed5bfb
|
Disable src jar
|
2015-11-26 20:50:17 +00:00 |
|
Modmuss50
|
7370784c7f
|
More textures
|
2015-11-26 20:43:56 +00:00 |
|
Modmuss50
|
82b99fed34
|
update forge and mappings
|
2015-11-26 08:26:09 +00:00 |
|
Modmuss50
|
fa11ff13bc
|
Build fix while waiting for an ic2 update
|
2015-11-24 19:44:24 +00:00 |
|
Modmuss50
|
46f4dc5d95
|
Prep for jenkins
|
2015-11-24 19:37:15 +00:00 |
|
Modmuss50
|
14ee45fcde
|
6518
|
2015-11-23 14:37:18 +00:00 |
|
modmuss50
|
7bcc793d12
|
Added javaDoc and updated deps
|
2015-11-22 16:24:50 +00:00 |
|
Modmuss50
|
66993f7239
|
Gradle 2.9
|
2015-11-18 11:22:56 +00:00 |
|
Modmuss50
|
798742fd20
|
Version 0.7.0
|
2015-11-17 17:44:21 +00:00 |
|
Modmuss50
|
473a981f51
|
Hot fix 0.6.1 and Fusion Reactor API
|
2015-11-16 20:27:45 +00:00 |
|
Modmuss50
|
25b5715ab8
|
Version 0.6.0
|
2015-11-15 21:13:28 +00:00 |
|
Modmuss50
|
351d7afadb
|
Update reborn core
|
2015-11-11 17:37:14 +00:00 |
|
modmuss50
|
ef03cf50a9
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
src/main/java/techreborn/asm/LoadingPlugin.java
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
src/main/java/techreborn/client/render/MultiblockRenderEvent.java
src/main/java/techreborn/compat/recipes/RecipesIC2.java
src/main/java/techreborn/init/ModItems.java
src/main/java/techreborn/lib/Location.java
src/main/java/techreborn/packets/PacketPipeline.java
src/main/java/techreborn/partSystem/fmp/CableConverter.java
|
2015-11-08 12:34:18 +00:00 |
|
modmuss50
|
8abf6e5282
|
Moved to RebornCore
|
2015-11-08 12:15:45 +00:00 |
|
Modmuss50
|
88f4737772
|
Version 0.5.6
|
2015-11-02 21:22:52 +00:00 |
|
modmuss50
|
edddb552c8
|
Version 0.5.5
|
2015-10-25 10:08:47 +00:00 |
|
modmuss50
|
5187f36fcd
|
gradle 2.8
|
2015-10-22 18:40:29 +01:00 |
|
Modmuss50
|
adb340feec
|
Version 0.5.4
|
2015-10-18 13:52:55 +01:00 |
|
modmuss50
|
a74154688c
|
Fixes #190
|
2015-10-17 20:21:43 +01:00 |
|
Modmuss50
|
03932c7e22
|
version 0.5.3
|
2015-10-08 08:27:29 +01:00 |
|
Modmuss50
|
48c52bd79d
|
version 0.5.2
|
2015-10-06 20:53:16 +01:00 |
|
Modmuss50
|
e8df232d75
|
Small issue with build script
|
2015-10-03 14:12:30 +01:00 |
|
modmuss50
|
3708a49bb9
|
Initial update to forestry 4(Sawmill recipes are not working)
|
2015-10-03 10:21:13 +01:00 |
|
Modmuss50
|
6a2c1e1c85
|
version 0.5.1
|
2015-10-02 07:48:44 +01:00 |
|
Modmuss50
|
3a256ad6f1
|
updated ic2 classic api
|
2015-09-29 08:17:24 +01:00 |
|
Modmuss50
|
15286baaa5
|
Started adding automated tests
|
2015-09-28 20:30:24 +01:00 |
|
Modmuss50
|
b5d4242029
|
Update a handful of dependencies
|
2015-09-28 20:00:39 +01:00 |
|
Modmuss50
|
b6259659e7
|
V 0.5.0
|
2015-09-26 16:36:02 +01:00 |
|
Modmuss50
|
111c5e6d5c
|
closes #152 the rewirten version is not their maven.
|
2015-09-23 16:16:53 +01:00 |
|
Modmuss50
|
d10c64be7f
|
version 0.4.3
|
2015-09-15 18:38:00 +01:00 |
|
Modmuss50
|
0bf7e1968e
|
Fixed ic2 classic support on the master!
|
2015-09-14 21:05:26 +01:00 |
|
modmuss50
|
65f3b30c51
|
Beta 0.4.2
|
2015-09-08 19:11:13 +01:00 |
|
modmuss50
|
9c5c016976
|
Added forestry api and removed needed source files in output jar
|
2015-09-08 13:04:05 +01:00 |
|
modmuss50
|
5b1ee4cddc
|
Beta 0.4.1
|
2015-09-07 21:03:47 +01:00 |
|
modmuss50
|
3b6202bece
|
Fixes #133, can now run standalone without ic2
|
2015-08-27 16:29:13 +01:00 |
|
modmuss50
|
5bceef3297
|
Version 0.4.0
|
2015-08-27 13:16:13 +01:00 |
|
gigabit101
|
85d19144b0
|
ALPHA 0.3.2
|
2015-08-15 23:38:22 +01:00 |
|
modmuss50
|
33c2375246
|
Updated things
|
2015-08-15 17:16:05 +01:00 |
|
modmuss50
|
b4d9a7d9d5
|
Version: ALPHA 0.3.1
|
2015-08-06 18:40:12 +01:00 |
|
modmuss50
|
f8803f3be1
|
Removed the univseral jar appendix, fixed small typo
|
2015-08-05 10:13:05 +01:00 |
|
modmuss50
|
f4e45916e2
|
Alpha 3
|
2015-08-04 17:47:38 +01:00 |
|
modmuss50
|
cab1691821
|
bump forge
|
2015-08-04 10:33:10 +01:00 |
|
modmuss50
|
984b502ded
|
fixes #85 , Fixes issues with RF output
|
2015-07-23 10:13:37 +01:00 |
|
modmuss50
|
38b73cd6a7
|
Added minetweaker to build script, for #70
|
2015-07-02 19:55:06 +01:00 |
|
modmuss50
|
c836e06678
|
Fixed mcmod.info stuff not getting replaced, removed the appendix on the file name because it was not needed
|
2015-07-01 16:53:03 +01:00 |
|
modmuss50
|
5b06a20351
|
Added ASM Method and Field stripper, more work on own power net
|
2015-07-01 16:41:40 +01:00 |
|
modmuss50
|
6ce5bb3063
|
Last time fixing the mcmod.info file
|
2015-06-23 23:41:03 +01:00 |
|
modmuss50
|
fbe5bfd915
|
Fixing the mcmod.info file again
|
2015-06-23 23:36:11 +01:00 |
|
modmuss50
|
6289d732e9
|
Fixed version in mcmod.info file
|
2015-06-23 23:30:02 +01:00 |
|
modmuss50
|
eb45fb8935
|
Might fix mcmod.info having the wrong version
|
2015-06-23 23:24:14 +01:00 |
|
modmuss50
|
482c07d991
|
Some small fixes to the gradle script.
|
2015-06-22 21:32:46 +01:00 |
|
modmuss50
|
45783b55f1
|
Fixes #38 on new ic2's
|
2015-06-19 18:07:15 +01:00 |
|
modmuss50
|
2ded7e0121
|
Added lesu logic. updated fmp to allow extra utils to run
|
2015-06-14 15:58:49 +01:00 |
|
modmuss50
|
0d20ba6d55
|
compile baubles, and use dev version of forcestry
|
2015-06-12 08:17:18 +01:00 |
|
modmuss50
|
0c7bf88a27
|
update buildcraft to 7.0.9
|
2015-06-11 08:25:14 +01:00 |
|
modmuss50
|
7b8f24eb60
|
Added Thaumcraft and baubles to the build script
|
2015-06-10 20:22:44 +01:00 |
|
modmuss50
|
e2677da137
|
added BOP to gradle
|
2015-06-10 20:06:46 +01:00 |
|
modmuss50
|
58223d71d9
|
fixed natural failing to download
|
2015-06-10 20:00:27 +01:00 |
|
modmuss50
|
aae7b02153
|
Added forestry, con, natura and mantle build support
|
2015-06-10 19:54:50 +01:00 |
|
modmuss50
|
2ef2ff997f
|
updated to build craft 7.0.8
|
2015-06-08 17:41:41 +01:00 |
|
modmuss50
|
27dc043946
|
updated to gradle 2.4, should speed some things up aparently
|
2015-06-06 13:40:01 +01:00 |
|
modmuss50
|
d68c63a40d
|
Added fluid crafting, updated buildcraft
|
2015-05-16 20:30:07 +01:00 |
|
modmuss50
|
d32b39d8c6
|
Machines no longer require an input in the set slot
|
2015-05-16 17:23:39 +01:00 |
|
modmuss50
|
b2fcb98003
|
removed .
|
2015-05-16 13:17:24 +01:00 |
|
modmuss50
|
1e969ff6cf
|
added ee3 to build script
|
2015-05-16 13:13:09 +01:00 |
|
modmuss50
|
b82f79dc04
|
Updated mods, Using the Beta forge loading screen version.
Removed cofh mods due to no debofed versions
|
2015-04-26 14:10:23 +01:00 |
|
modmuss50
|
32ebd35656
|
This should be a jar not a zip
|
2015-04-26 09:07:59 +01:00 |
|
Modmuss50
|
49d0e480e1
|
Removed modmussCore
|
2015-04-20 21:30:24 +01:00 |
|
modmuss50
|
5164301ffb
|
Added my Part API, need ModmussCore and QLIB
|
2015-04-20 20:08:14 +01:00 |
|
Modmuss50
|
da98fc02a3
|
Still not sure this will work
|
2015-04-17 19:42:09 +01:00 |
|
Modmuss50
|
ce581cd27a
|
Testing thermal expansion in gradle.
|
2015-04-17 19:30:36 +01:00 |
|
Modmuss50
|
e21adb0bd8
|
Added buildcraft
|
2015-04-17 18:38:03 +01:00 |
|
modmuss50
|
ee14540196
|
Removed 2 PreInits, added waila support
|
2015-04-12 11:39:06 +01:00 |
|
modmuss50
|
6f75bd48e0
|
Updated gralde from 1.6-2.3, added Deps for later
|
2015-04-12 10:56:23 +01:00 |
|
modmuss50
|
6cb9e50345
|
small changes to gradle, added api artifact
|
2015-04-12 10:36:12 +01:00 |
|
modmuss50
|
e57f1c1e85
|
Added api package file, testing some gradle changes
|
2015-04-12 10:25:06 +01:00 |
|
modmuss50
|
9f1283100d
|
Cleaned up gradle
|
2015-04-10 09:43:45 +01:00 |
|
modmuss50
|
700012697e
|
Finishing off for tonight.
|
2015-04-10 00:18:13 +01:00 |
|
modmuss50
|
da25ed6add
|
Added basic mod :)
|
2015-04-09 23:17:30 +01:00 |
|