payonel
8a4b1fa4f5
add sheep power
...
- add carpeted capacitor and configurations
- remove check for power providing mod
- remove localization about power check
2018-01-01 12:02:13 -08:00
payonel
2d611528c9
Merge branch master-MC1.11 into master-MC1.12
2017-12-31 10:49:44 -08:00
payonel
f04c60d2c9
Merge branch master-MC1.10 into master-MC1.11
2017-12-31 10:49:42 -08:00
payonel
dd3763f0e1
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-31 10:49:31 -08:00
payonel
7432030d16
reduce glyph log noise
2017-12-31 10:42:25 -08:00
payonel
14933e87d8
Merge branch master-MC1.11 to master-MC1.12
2017-12-31 10:32:34 -08:00
payonel
6ccf337996
fixing more merge issues
...
# Conflicts:
# src/main/resources/assets/opencomputers/models/item/wlanCard.json
# src/main/resources/assets/opencomputers/models/item/wlanCard1.json
# src/main/resources/assets/opencomputers/models/item/wlancard.json
2017-12-31 10:31:05 -08:00
payonel
0d7743fcef
item texture fixes for new items
2017-12-31 10:02:00 -08:00
payonel
28e09825e1
Merge branch master-MC1.11 into master-MC1.12
2017-12-31 00:35:20 -08:00
payonel
8be2816b0c
fix bad merge
2017-12-31 00:34:18 -08:00
payonel
6caf59fffa
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/init/Items.scala
2017-12-31 00:23:52 -08:00
payonel
f2eb66fa26
fix bad merge
2017-12-31 00:03:08 -08:00
payonel
7cab775901
allow setting chars to remove preceding wide chars
2017-12-30 22:45:26 -08:00
payonel
3b4d077e97
Merge branch master-MC1.11 into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/MotionSensor.scala
2017-12-26 16:45:44 -08:00
payonel
5a6d2b2d5a
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# build.gradle
# src/main/resources/assets/opencomputers/doc/de_DE/item/index.md
# src/main/resources/assets/opencomputers/doc/de_DE/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/de_DE/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/de_de/item/wlancard.md
# src/main/resources/assets/opencomputers/doc/en_US/item/index.md
# src/main/resources/assets/opencomputers/doc/en_US/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/en_US/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/en_us/item/wlancard.md
# src/main/resources/assets/opencomputers/doc/fr_FR/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/fr_FR/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/fr_fr/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/ru_RU/item/wlanCard.md
# src/main/resources/assets/opencomputers/doc/ru_RU/item/wlanCard1.md
# src/main/resources/assets/opencomputers/doc/ru_ru/item/wlanCard.md
# src/main/resources/assets/opencomputers/lang/en_US.lang
# src/main/resources/assets/opencomputers/lang/fr_FR.lang
# src/main/resources/assets/opencomputers/lang/it_IT.lang
# src/main/resources/assets/opencomputers/lang/pt_BR.lang
# src/main/resources/assets/opencomputers/lang/pt_PT.lang
# src/main/resources/assets/opencomputers/lang/ru_RU.lang
# src/main/resources/assets/opencomputers/lang/zh_CN.lang
# src/main/resources/assets/opencomputers/lang/zh_TW.lang
# src/main/resources/assets/opencomputers/recipes/default.recipes
# src/main/resources/assets/opencomputers/recipes/gregtech.recipes
# src/main/resources/assets/opencomputers/recipes/hardmode.recipes
# src/main/resources/assets/opencomputers/recipes/peaceful.recipes
# src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard1.png
# src/main/resources/assets/opencomputers/textures/items/wlanCard.png
# src/main/resources/assets/opencomputers/textures/items/wlancard.png
# src/main/scala/li/cil/oc/Constants.scala
# src/main/scala/li/cil/oc/common/Proxy.scala
# src/main/scala/li/cil/oc/common/init/Items.scala
# src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
# src/main/scala/li/cil/oc/common/tileentity/Relay.scala
# src/main/scala/li/cil/oc/server/component/LinkedCard.scala
# src/main/scala/li/cil/oc/server/component/NetworkCard.scala
# src/main/scala/li/cil/oc/util/FontUtils.scala
2017-12-26 16:42:22 -08:00
payonel
3b40a8e1b8
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard.png
# src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard1.png
# src/main/resources/assets/opencomputers/textures/items/wlanCard.png
# src/main/scala/li/cil/oc/Settings.scala
# src/main/scala/li/cil/oc/common/Proxy.scala
# src/main/scala/li/cil/oc/common/init/Items.scala
# src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
# src/main/scala/li/cil/oc/common/tileentity/Relay.scala
# src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
2017-12-26 07:49:29 -08:00
Vexatos
d26277ff4b
Retain packet data when necessary.
...
For #2695 .
2017-12-24 12:35:36 +01:00
payonel
f9cd34580a
fixing motion sensor again
...
stuff changed again between 1.7.10 to 1.10
closes #2692
2017-12-23 01:31:56 -08:00
payonel
d67156ed52
update font.hex (thanks @asie) and drop wcwidth.bin
...
now server loads glyph sizes by parsing font.hex
closes #2676
2017-12-22 07:48:50 -08:00
Aaron Gallagher
231fa13fb9
Fix the crafting upgrade to use SlotCrafting.
...
This handles basically all of the funky corner cases around crafting,
including things like decrementing stacks and repairing items and all
of the necessary event posting. Tested to work correctly with IC2's
Forge Hammer too.
Should fix #2532 .
2017-12-18 21:51:03 -08:00
payonel
9c509508a7
French translation fixes
...
Thanks to @Naheulf
Closes #2061
2017-12-18 17:47:26 -08:00
Xyxen
fd9b81582b
Fix runClient and runServer Gradle tasks ( #2673 )
...
Compile dependencies are placed on the runtime classpath by Gradle.
Because the compile configuration is set to extend from the provided
config, all of those dependencies are put on the runtime classpath as
well.
In this patch, provided is instead made a separate configuration, and
explicitly added to ONLY the compile classpath of the main sourceset.
2017-12-17 21:10:31 -08:00
payonel
daef43aef7
revert Optional removal from 1.12
2017-12-17 21:03:24 -08:00
payonel
9917cadd8b
reverted @Optional removal that was meant for < 1.11
2017-12-17 20:45:51 -08:00
payonel
719498163c
fix relays save/load without wireless cards
2017-12-16 01:16:45 -08:00
Xyxen
62c661649b
Fix wrong Gradle version being used on Travis CI ( #2672 )
...
Using the default Gradle install on Travis is dangerous, because a
version upgrade on their end could break the build. It's already broken
because the version of ForgeGradle the current script relies on expects
ScalaCompileOptions.setUseAnt to exist, but it was removed in Gradle 3.
This patch reconfigures Travis to use the Gradle wrapper instead, which
standardizes the version in use.
2017-12-15 21:06:48 -08:00
payonel
aa375ec823
fix config/settings to expect 1.7.2 next, not 1.7.3
2017-12-15 05:38:20 -08:00
payonel
22c6b15d39
missed settings changes needed for t1 card and version check
2017-12-14 09:50:15 -08:00
payonel
d82a05fa28
comment version for new items
2017-12-14 07:59:26 -08:00
TheCodex6824
11f2c0a358
Add tier 1 wireless card ( #2657 )
...
* Added tier 1 wireless card as discussed in #2562
* Update lang/doc files
Remove unneeded component callback override
Add alias for old wlanCard name
* Moved wired and wireless max ports into one array
Added tested OreDict entry for wlanCard
* Bump version number for config updates
Fix typo in config comment
2017-12-14 07:44:23 -08:00
Xyxen
f485c7a898
Add creative component bus ( #2670 )
...
Supports 1024 components by default, and fits into a tier 3 slot.
2017-12-14 06:13:35 -08:00
Vexatos
40eb91d6b8
Merge branch 'master-MC1.11' into master-MC1.12
2017-12-11 13:24:12 +01:00
Vexatos
24a3056406
Merge branch 'master-MC1.10' into master-MC1.11
2017-12-11 13:22:53 +01:00
Vexatos
1633375355
Merge branch 'master-MC1.7.10' into master-MC1.10
2017-12-11 13:16:29 +01:00
Vexatos
ed6fe13ba4
Added curseforge plugin and change log.
...
Hopefully it works.
2017-12-11 13:07:12 +01:00
Vexatos
4c8799f38a
Added ComputerCraft support back to 1.12.
2017-12-10 16:40:25 +01:00
Vexatos
c6cdd99d0e
Merge branch 'master-MC1.11' into master-MC1.12
2017-12-10 13:21:58 +01:00
Vexatos
88aec7ee9d
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.properties
2017-12-10 13:21:07 +01:00
Vexatos
67ddab828a
Merge branch 'master-MC1.7.10' into master-MC1.10
2017-12-10 13:20:19 +01:00
Vexatos
b2cde198c1
Version bump.
2017-12-10 13:19:22 +01:00
payonel
97ad5ebdaf
1.12 build fix, Vec3d x,y,z and not xCoord,etc
2017-12-10 04:06:57 -08:00
payonel
90868bcb6b
Merge branch master-MC1.11 into master-MC1.12
2017-12-10 03:53:23 -08:00
payonel
c0eefc152e
Merge branch master-MC1.10 into master-MC1.11
2017-12-10 03:53:14 -08:00
payonel
1ed434d1bf
Merge branch master-MC1.7.10 into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/MotionSensor.scala
2017-12-10 03:53:10 -08:00
payonel
7933f5d7b4
fix motion sensor line of site
...
a new solution to use a normalized path vector and move the origin directly towards the player by .75m
closes #2615
2017-12-10 03:37:38 -08:00
payonel
69a81c3732
Merge branch master-MC1.11 into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
2017-12-09 22:08:38 -08:00
payonel
04eae30965
Merge branch master-MC1.10 into master-MC1.11
2017-12-09 21:57:53 -08:00
payonel
7b1867a888
tablet card support fixed
2017-12-09 21:55:54 -08:00
payonel
c23cb987f4
Merge branch master-MC1.11 into master-MC1.12
2017-12-06 07:48:10 -08:00
payonel
ef97a06305
Merge branch master-MC1.10 into master-MC1.11
...
#removed src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala from merge
#673facee9077454b8401b1bb018f626e02bf3802
2017-12-06 07:48:07 -08:00
